Merge pull request #538 from KhronosGroup/fix-io-block-location

Distinguish between enhanced_layouts and SSO requirements.