Merge branch 'master_14.3.1' (14.3.1-41) into omaha_14.3.1

Former-commit-id: d3a514a4604616a20f21489212feb92db4138dfc

cave/com.raytheon.viz.grid/localization/menus/mrms/index.xml

@@ -4,7 +4,7 @@
      Darrel Kingfield	NOAA/NSSL/CIMMS 		09-02-2014			Initial File Creation
     -->
 <menuContributionFile>
-	<include installTo="menu:org.eclipse.ui.main.menu?after=radar"
+	<include installTo="menu:mrms?after=MRMS_MENU_START"
 			 fileName="menus/mrms/mrms.xml">
 	</include>
 </menuContributionFile>

cave/com.raytheon.viz.grid/localization/menus/mrms/mrms.xml

@@ -5,8 +5,6 @@
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<!-- Set the initial top level menu -->
-	<contribute xsi:type="subMenu" menuText="MRMS">
 	<contribute xsi:type="titleItem" titleText="---Multiple-Radar/Multiple-Sensor---" id="MRMS-SVR"/>
 	<contribute xsi:type="subinclude" fileName="menus/mrms/mrmsProducts.xml"/>
- 	</contribute>
 </menuTemplate>

cave/com.raytheon.viz.grid/plugin.xml

@@ -53,4 +53,21 @@
             name="Grid"
             category="com.raytheon.uf.viz.productbrowser.productbrowserpreferencespage"/>
    </extension>
+     <extension
+           point="org.eclipse.ui.menus">
+        <menuContribution
+              locationURI="menu:org.eclipse.ui.main.menu?after=radar">
+           <menu
+                 id="mrms"
+                 label="MRMS">
+              <visibleWhen>
+                 <reference
+                       definitionId="com.raytheon.uf.viz.d2d.ui.inD2DActionSet">
+                 </reference>
+              </visibleWhen>
+
+              <separator name="MRMS_MENU_START" visible="false"/>
+           </menu>
+        </menuContribution>
+     </extension>
 </plugin>