Group all vmtools logs in /var/log/vmware directory.

--- a/open-vm-tools/libvmtools/vmtoolsLog.c
+++ b/open-vm-tools/libvmtools/vmtoolsLog.c
@@ -79,7 +79,7 @@
 #define DEFAULT_LOGFILE_DIR "%windir%"
 #define DEFAULT_LOGFILE_NAME_PREFIX "vmware"
 #else
-// *ix log goes to /var/log/vmware-<service>.log
+// *ix log goes to /var/log/vmware/<service>.log
 #define DEFAULT_LOGFILE_NAME_PREFIX  "/var/log/vmware"
 #endif
 
@@ -827,7 +827,7 @@
                           domain,
                           g_get_user_name());
 #else
-   path = g_strdup_printf("%s-%s-%s.log", DEFAULT_LOGFILE_NAME_PREFIX,
+   path = g_strdup_printf("%s/%s-%s.log", DEFAULT_LOGFILE_NAME_PREFIX,
                           domain,
                           g_get_user_name());
 #endif
--- a/open-vm-tools/vgauth/service/service.h
+++ b/open-vm-tools/vgauth/service/service.h
@@ -89,7 +89,7 @@
 #define LOGFILENAME_DEFAULT "vgauthsvclog.txt"
 #define LOGFILENAME_PATH_DEFAULT "c:\\temp\\" LOGFILENAME_DEFAULT
 #else
-#define LOGFILENAME_PATH_DEFAULT "/var/log/vmware-vgauthsvc.log"
+#define LOGFILENAME_PATH_DEFAULT "/var/log/vmware/vgauthsvc.log"
 #endif
 
 void Service_SetLogOnStdout(gboolean flag);
--- a/open-vm-tools/scripts/common/vm-support
+++ b/open-vm-tools/scripts/common/vm-support
@@ -331,7 +331,7 @@
 addfiles /var/log/secure*
 addfiles /var/log/messages*
 addfiles /var/log/syslog*
-addfiles /var/log/vmware-*
+addfiles /var/log/vmware/*
 addfiles /var/run/vmware-*
 addfile /var/log/cloud-init.log
 addfile /var/log/cloud-init-output.log
--- open-vm-tools-stable-11.0.5.orig/open-vm-tools/scripts/linux/network
+++ open-vm-tools-stable-11.0.5/open-vm-tools/scripts/linux/network
@@ -26,7 +26,7 @@
 # of suspend and resume events, respectively.
 #
 
-logbase=/var/log/vmware-network
+logbase=/var/log/vmware/network
 logfile=$logbase.log
 
 #
--- a/open-vm-tools/services/plugins/deployPkg/deployPkgLog.c
+++ b/open-vm-tools/services/plugins/deployPkg/deployPkgLog.c
@@ -73,7 +73,7 @@
 
    Str_Strcat(logPath, "vmware-imc", sizeof logPath);
 #else
-   Str_Strcpy(logPath, "/var/log/vmware-imc", sizeof logPath);
+   Str_Strcpy(logPath, "/var/log/vmware", sizeof logPath);
 #endif
 
    if (File_CreateDirectoryHierarchy(logPath, NULL)) {
--- a/open-vm-tools/libDeployPkg/linuxDeployment.c
+++ b/open-vm-tools/libDeployPkg/linuxDeployment.c
@@ -86,7 +86,7 @@
 #endif
 
 #ifndef CABCOMMANDLOG
-#define CABCOMMANDLOG "/var/log/vmware-imc/toolsDeployPkg.log"
+#define CABCOMMANDLOG "/var/log/vmware/toolsDeployPkg.log"
 #endif
 
 #define MAXSTRING 2048