acu161225 fix rs_state help
acu159068 trim passed tags to mimic dashboard behavior
Merge pull request #421 from rightscale/ivory_14_10_acu167641_cherry_pick_fixes_from_master

Ivory 14 10 acu167641 cherry pick fixes from master