Merge "CIS compliance (/dev/shm mount options)"