Merge "REC-417 Disable root login by changing root shell"