Merge "Omaha #3299 - Fix collaboration RPM build issue" into omaha_14.4.1

Former-commit-id: 40e2f812cc [formerly da49b73121818f3022f71deee8a2a57230b2a227]
Former-commit-id: 3b596f12d8

javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/plugin.xml

@@ -8,7 +8,7 @@
    	via openfire whenever a user logs in to openfire.
    </description>
    <author>bkowal</author>
-   <version>2.0.0</version>
+   <version>2.1.0</version>
    <date>8/08/2012</date>
    <minServerVersion>3.7.1</minServerVersion>
    
@@ -26,4 +26,4 @@
    		</sidebar>
    	</tab>
    </adminconsole>
-</plugin>
+</plugin>

rpms/awips2.core/Installer.xmpp/component.spec

@@ -13,7 +13,7 @@
 Name: awips2-%{_xmpp_server}
 Summary: AWIPS II XMPP Server
 Version: %{_xmpp_software_version}
-Release: 2
+Release: 3
 Group: AWIPSII
 BuildRoot: /tmp
 URL: %{_xmpp_software_url}