Fix 7079 mount.mounted state leaves conflicting lines in /etc/fstab
Making PEP8 compliant
Merge pull request #9573 from dmyerscough/develop

Fix 7079 mount.mounted state leaves conflicting lines in /etc/fstab