Backport #27160 to 2016.11

Author: Chris Fane

salt/modules/mount.py

@@ -82,7 +82,7 @@ def _active_mountinfo(ret):
                              'root': comps[3],
                              'opts': _resolve_user_group_names(comps[5].split(',')),
                              'fstype': comps[_sep + 1],
-                             'device': device_name,
+                             'device': device_name.replace('\\040', '\\ '),
                              'alt_device': _list.get(comps[4], None),
                              'superopts': _resolve_user_group_names(comps[_sep + 3].split(',')),
                              'device_uuid': device_uuid,
@@ -539,7 +539,7 @@ def set_fstab(
     # preserve arguments for updating
     entry_args = {
         'name': name,
-        'device': device,
+        'device': device.replace('\\ ', '\\040'),
         'fstype': fstype,
         'opts': opts,
         'dump': dump,