Merge from SFDC to Github

* Hiding secure option data from logs
* Fix bug with trying to format log lines with no args
* Handle 0.8.2 salt-api non backward compatible json responses