Internal error message fixed

Change-Id: I4468a5ce2fff017e3f0188a281797fe2de8690af
Req/resp exchange logging is now configurable

Fixes bug #1199067

Change-Id: Ib30c69efc4324150b1c0656a9a1c9448639dbc84
Merge "Internal error message fixed"
Merge "Req/resp exchange logging is now configurable"