FELIX-3915 Fix timing hole between config admin and component holder creation/registration. Also java 5-ization