This reverts commit 67e69a55, applying a band-
aid fix to cli_ure/source/climaker for now.

Conflicts:
	stoc/inc/bootstrapservices.hxx
	stoc/source/tdmanager/lrucache.hxx
	stoc/source/tdmanager/tdmgr.cxx
	stoc/source/tdmanager/tdmgr_common.hxx
	stoc/source/tdmanager/tdmgr_tdenumeration.cxx
	stoc/source/tdmanager/tdmgr_tdenumeration.hxx

Change-Id: Iae669985d0194f06fa349a4a39f0ebd230bc5d28