AMBARI-17773. NFS_GATEWAY version reports incorrect in DB after EU (ncole)

ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml

@@ -27,7 +27,7 @@
           <name>NFS_GATEWAY</name>
           <displayName>NFSGateway</displayName>
           <cardinality>0+</cardinality>
-          <versionAdvertised>false</versionAdvertised>
+          <versionAdvertised>true</versionAdvertised>
           <category>SLAVE</category>
           <commandScript>
             <script>scripts/nfsgateway.py</script>

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

@@ -221,6 +221,7 @@
       <service-check>false</service-check>
       <service name="HDFS">
         <component>DATANODE</component>
+        <component>NFS_GATEWAY</component>
       </service>
 
       <service name="HBASE">
@@ -572,6 +573,12 @@
           <task xsi:type="restart-task" />
         </upgrade>
       </component>
+      
+      <component name="NFS_GATEWAY">
+        <upgrade>
+          <task xsi:type="restart-task" />
+        </upgrade>
+      </component>
 
       <component name="HDFS_CLIENT">
         <upgrade>

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

@@ -231,6 +231,7 @@
       <service-check>false</service-check>
       <service name="HDFS">
         <component>DATANODE</component>
+        <component>NFS_GATEWAY</component>
       </service>
 
       <service name="HBASE">
@@ -634,6 +635,12 @@
           <task xsi:type="restart-task" />
         </upgrade>
       </component>
+      
+      <component name="NFS_GATEWAY">
+        <upgrade>
+          <task xsi:type="restart-task" />
+        </upgrade>
+      </component>
 
       <component name="HDFS_CLIENT">
         <upgrade>

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

@@ -226,6 +226,7 @@
       <service-check>false</service-check>
       <service name="HDFS">
         <component>DATANODE</component>
+        <component>NFS_GATEWAY</component>
       </service>
 
       <service name="HBASE">
@@ -627,6 +628,12 @@
           <task xsi:type="restart-task" />
         </upgrade>
       </component>
+      
+      <component name="NFS_GATEWAY">
+        <upgrade>
+          <task xsi:type="restart-task" />
+        </upgrade>
+      </component>
 
       <component name="HDFS_CLIENT">
         <upgrade>