Merge pull request #662 from ifreecarve/2013-03-08_startup_config

startup config (+tests) for instrument agent instance, typos fixed
OOIION-718: raise proper errors, properly test for failing activate_deployment cases