Merge "Use skip_checks instead of skipUnless in TestShelveInstance"