Dynamic acceptor ports not accounted for in headless service

The headless service is statically configured with ports exposed for 1883, 5672, 8161, 61613, and 61616. However the acceptors aren't necessarily configured for protocols on those ports. Once configured in the beginning the headless service is also not updated at any point based on the actually configured acceptors.
While it is the case that each acceptor automatically generates an individual service and route for itself, it would be good if we updated the headless service to match.