Added robustness to service generation so that services avalable to unit
test.
Merge branch 'master' of git@github.com:DawnScience/dawn-ui.git