Merge changes I459078c4,I36be1b49

* changes:
  storaged: clean up output format
  storaged: replace string functions that can throw exception