Merge pull request #1143 from KhronosGroup/interlock

Merge SPV_EXT_fragment_shader_interlock with fixes