Fix regression in mount.mounted state

This pull request fixes #6545. In addition, it also improves reporting for this state when run with test=True, so that it properly reports what changes would have been made.