Merge pull request #2248 from tano-systems/fstab-translateble-swap