OOIION-718: raise proper errors, properly test for failing activate_deployment cases
Merge pull request #555 from ifreecarve/2013-02-11_OOIION-718

OOIION-718: raise proper errors, properly test for failing activate_deployment cases