Don't explode on "rabbitmqctl stop_app ; rabbitmqctl status", and fix tests.
Merge bug25722 (again again).