Fixes to mount module

Each line can have any number of optional parameters, we use the location of the seperator field to determine the location of the elements after it.
On remount, the remount option was ending up in the /etc/fstab.
Ensuring that it is removed from the options.
Some mount options end up in the superopts so we should look for them there too.
#18874