acu43764 fix bugs discovered during right_infrastructure_agent integration
Merge pull request #74 from rightscale/aqua_13_1_acu43764_resolve

acu43764 fix bugs discovered during right_infrastructure_agent integration