Handle sudoers NOPASSWD config change correctly.
Merge branch 'ubuntu-sudoers-fix' into ptc