Merge in OL/olympus-identity from kd_OL-86 to master
* commit 'fd877d888179b518066be93d295c3604bbd8d079':
Remove uncommented code. Undo debugging log level
remove string quotations
Use error level when logging exceptions
Use error level when logging exceptions