Bug 452335 - Support compilation with Juno and Kepler

Change-Id: Ib5258a3d0810bf81b97e20e7f411999534a13eb4
Reviewed-on: https://git.eclipse.org/r/36709
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>