Fix salt.modules.mount.active to use /proc/self/mounts, unless user explicitly enabled use of /proc/self/mountinfo via extended=True option. Fix remount on every state application, when options that don't appear in /proc/self/mounts are used.
Merge pull request #15498 from basepi/bp-15464

Backport #15464 to 2014.7