Do not clean up user file when rmr is unsuccessful
Merge branch 'STORM-357' of https://github.com/d2r/incubator-storm into STORM-357

STORM-357: Cleans workers-users file only when rmr is successful