mapr sample change for swap disk.
Fix bug SERENGETI-1540 'user name and password are printed in serengeti.log when log in failed in Serengeti CLI'.
Merge branch 'master' of http://github.com/vmware-serengeti/serengeti-ws