FELIX-1841 Apply DependencyManager part of FELIX-1841.patch.2 supplied by Pierre de Rop (thanks) with the slight modification of guarding the rebind with a configuration setting. Also added integration tests validating this fix.