OOIION-791 and other service spec cleanup
Merge pull request #887 from ifreecarve/2013-04-05_OOIION-791

OOIION-791 and other service spec cleanup