correct some error messages in CLI(acctually may also be used in other modules)
correct error message according to Jun's comments
fix 2 error messages according to Monique's suggestion
delete one blank line to keep good format
Merge branch 'master' of github.com:vmware-serengeti/serengeti-ws