Comment 41 for bug 1466982

This is the juno/icehouse patch for the maas change. NB As before the rabbit monitor will need to be manually removed/changed and the new vars will need to be copied over (they are in the user_variables file for juno/icehouse, and in the user_extras_secrets/variables in kilo/master).

This patch goes in os-ad since the maas work had not been removed at the point of juno/icehouse.