REP-745-2: updated change to master
add test for REP-745 remove ***DEPRECATE*** ...
update msg
rename test
Merge pull request #1028 from rackerlabs/REP-745-2

REP-745-2: updated change to master