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