JB 4.2 hackery

Change-Id: I06c76316fcff03bd3fba5430984169535536da82

Conflicts:
	include/utils/Singleton.h