Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev