Merge branch 'master_14.4.1' of ssh://github.com/Unidata/awips2 into master_14.4.1

Former-commit-id: a8c5aa09bfc91a4d86d6e4fb773c6076daa7a8e0 [formerly d58d2166b5]
Former-commit-id: f9ebf0581e

cave/com.raytheon.viz.product.awips/awips.product

@@ -15,7 +15,7 @@
 
    <launcherArgs>
       <programArgs>-data @user.home/caveData -user @user.home/caveData</programArgs>
-      <programArgsLin>-consoleLog -component thinclient</programArgsLin>
+      <programArgsLin>-consoleLog</programArgsLin>
       <vmArgs>-XX:+UseG1GC
 -Dosgi.instance.area.readOnly=true 
 -Declipse.log.enabled=false

rpms/awips2.core/Installer.httpd-pypies/component.spec

@@ -7,7 +7,7 @@
 Summary: Pypies Apache HTTP Server
 Name: awips2-httpd-pypies
 Version: 2.2.15
-Release: 15.6.el6
+Release: 15.7.el6
 URL: http://httpd.apache.org/
 Source0: http://archive.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html

rpms/awips2.upc/Installer.ldm/component.spec

@@ -9,7 +9,7 @@
 Name: awips2-ldm
 Summary: AWIPS II LDM Distribution
 Version: %{_ldm_version}
-Release: 3
+Release: %{_component_version}.%{_component_release}
 Group: AWIPSII
 BuildRoot: /tmp
 BuildArch: noarch

rpms/awips2.upc/Installer.ldm/patch/etc/scour.conf

@@ -13,5 +13,5 @@
 
 #~ldm/data/dir1			2
 #~ldm/data/dir2			2		*.foo
-/usr/local/ldm/logs		2		*.stats
+#/usr/local/ldm/logs		2		*.stats
 /data_store			1