AMBARI-14655. RU: Oozie service check failed during upgrade (ncole)

ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml

@@ -484,6 +484,10 @@
         <task xsi:type="configure" id="hdp_2_3_0_0_oozie_remove_redundant_configurations"/>
       </execute-stage>
 
+      <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server">
+        <task xsi:type="configure" id="hdp_2_4_0_0_oozie_remove_service_classes" />
+      </execute-stage>
+
       <!--KNOX-->
       <execute-stage service="KNOX" component="KNOX_GATEWAY" title="Apply config changes for Knox Gateway">
         <task xsi:type="configure" id="hdp_2_3_0_0_knox_configure_ranger_policy"/>

ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml

@@ -742,6 +742,7 @@
       <component name="OOZIE_SERVER">
         <pre-upgrade>
           <task xsi:type="configure" id="hdp_2_3_0_0_oozie_remove_redundant_configurations"/>
+          <task xsi:type="configure" id="hdp_2_4_0_0_oozie_remove_service_classes" />
 
           <task xsi:type="execute" hosts="all" summary="Shut down all Oozie servers">
             <script>scripts/oozie_server.py</script>

ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml

@@ -280,6 +280,10 @@
         <task xsi:type="configure" id="hdp_2_4_0_0_webhcat_server_update_configuration_paths"/>
       </execute-stage>
 
+      <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server">
+        <task xsi:type="configure" id="hdp_2_4_0_0_oozie_remove_service_classes" />
+      </execute-stage>
+
       <!-- KAFKA  -->
       <!--TODO: remove? Used for non-rolling upgrade only-->
       <execute-stage service="KAFKA" component="KAFKA_BROKER" title="Apply config changes for Kafka">

ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml

@@ -636,6 +636,8 @@
     <service name="OOZIE">
       <component name="OOZIE_SERVER">
         <pre-upgrade>
+          <task xsi:type="configure" id="hdp_2_4_0_0_oozie_remove_service_classes" />
+        
           <task xsi:type="execute" hosts="all" summary="Shut down all Oozie servers">
             <script>scripts/oozie_server.py</script>
             <function>stop</function>

ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml

@@ -30,6 +30,17 @@
         </changes>
       </component>
     </service>
+    
+    <service name="OOZIE">
+      <component name="OOZIE_SERVER">
+        <changes>
+          <definition xsi:type="configure" id="hdp_2_4_0_0_oozie_remove_service_classes" summary="Updating Oozie Service classes">
+            <type>oozie-site</type>
+            <replace key="oozie.services" find="org.apache.oozie.service.CoordinatorStoreService," replace-with="" />
+          </definition>
+        </changes>
+      </component>
+    </service>
 
     <service name="HIVE">
       <component name="HIVE_SERVER">