merge regression fix & re-enable GELF logging

Change-Id: Ibf898fdf113e7a1cd0df4cb7879a273e9f3e01dc