use service so we are compatible with rhel7
Merge remote-tracking branch 'origin/1.12' into release-14.0.2