Share some schema conversion functionality between Feature and Map services
Fixes for problems encountered while composing test plan