Merge "add "shutdown critical" to service" into oc-dr1-dev