Upmerge to master after multinode hadoop fix
restore lost handler.stop calls
Log an error instead of printing a trace
Restore appHome to dfs path for configs
Fix typo in setting STORM_CONF_PATH_STRING
Correct merge error handling AM reboot flag
Remove unnecessary white-space change
Client creates empty Map when no config is given
Remove unnecessary null check
Merge pull request #3 from d2r/func-test-master-merge-jun18

Upmerge to master after multinode hadoop fix