This is largely a revert of 6e7f2766c888939942d6063afb3f343cfb2d2d80. We then also need to reinstate `ArtemisConnectionFactoryConfiguration.PooledConnectionFactoryConfiguration`