Merge "Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev am: 31cf02742e" into oc-dr1-dev