Revert failsafe.conf fix, do network device checking in karoshi-update.conf
Merge branch 'develop'
Increase maximum range of UIDs to 10,000,000
Merge branch 'master' into develop