Using activators to register/unregister the singletons appears to work - can install rtgov-all and switchyard features and then installed rtgov samples and they worked fine. Need to try out other swyd features (e.g. switchyard-quickstart-bean-service) and then tidy up changes and get them working in EAP.