switch to new mount system, use more safety mount options
Merge branch 'cm10.1-2.6.32' into martincz