Merge "Do not run mapLockTest on 4.9 kernels" into main