Merge r260987:

 Do not exit with non-zero return code if sysctl.conf or sysctl.conf.local files
 are absent.

 Approved by:	delphij