[OE-4115] comments formatting
[OE-4249] IOP instrument ordering
[OE-4367] - removing IOP default code
[OE-4417] fixed stray 'Role:' in output
[OE-4274] refraction validation bug fix
Merge branch 'release/1.7' into develop