Merge pull request #209 from apigee/USERGRID-2099

Usergrid 2099
fix logging of exceptions, reformatting
Merge pull request #210 from apigee/USERGRID-2177

fix logging of exceptions, reformatting