Comment 25 for bug 1432489

Thanks for the review and updated files. I have merged those into the trunk.

Johnsca, about the services at the end - please note the charm deletes the queue manager. So it is tested again in the script.