Merge Request #26 - 2017-05-18

Some uncaught regression from Merge Request #25 are in here.

Fixes

libqi-python:

• qi.Logger fix _logGetTraceInfo() parachute #38170

libqi:

• Fix Revert “JSON: do not pretend map with non-string keys are supported” (#38432)
• Fix TcpMessageSocket: Set default timeout to 30sec (#38425)