Re-cleanup for LPS-47688 Register EmailAddressGenerator/Validator from OSGi