Merge branch 'stable-12.1.x' - with open-vm-tools 12.1.0 release.

diff --cc open-vm-tools/lib/include/vm_tools_version.h
index 2f5e75b4fbb1188c04b965b05b2946429b76ec06,2435d4bc4c3a6f59d5be16267f8a974133fbd1ed..c3f9a240b2b2a6503fd06fc8a96f359f61fef795
--- 1/open-vm-tools/lib/include/vm_tools_version.h
--- 2/open-vm-tools/lib/include/vm_tools_version.h
+++ b/open-vm-tools/lib/include/vm_tools_version.h
@@@ -1699,11 -1706,18 +1706,25 @@@ TOOLS_VERSION_UINT_TO_COMPONENTS(const 
  #endif /* RC_INVOKED */
  #define   TOOLS_VERSION_SABRE_SAW_UPDATE1_V_MJR  12
  #define   TOOLS_VERSION_SABRE_SAW_UPDATE1_V_MNR  0
 -#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_NEXT
 -#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_NEXT)
 -#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_NEXT)
+ #define   TOOLS_VERSION_SABRE_SAW_UPDATE1_V_BASE 5
+ 
+ #ifndef RC_INVOKED
+ #define   TOOLS_VERSION_NEXT TOOLS_VERSION_TO_UINT(TOOLS_VERSION_NEXT_V)
+ #endif /* RC_INVOKED */
+ #define   TOOLS_VERSION_NEXT_V_MJR  12
+ #define   TOOLS_VERSION_NEXT_V_MNR  1
+ #define   TOOLS_VERSION_NEXT_V_BASE 0
+ 
++#ifndef RC_INVOKED
++#define   TOOLS_VERSION_SABRE_SAW_UPDATE1 TOOLS_VERSION_TO_UINT(TOOLS_VERSION_SABRE_SAW_UPDATE1_V)
++#endif /* RC_INVOKED */
++#define   TOOLS_VERSION_SABRE_SAW_UPDATE1_V_MJR  12
++#define   TOOLS_VERSION_SABRE_SAW_UPDATE1_V_MNR  0
 +#define   TOOLS_VERSION_SABRE_SAW_UPDATE1_V_BASE 5
 +
 +#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_SABRE_SAW_UPDATE1
 +#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_SABRE_SAW_UPDATE1)
 +#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_SABRE_SAW_UPDATE1)
  
  /*
   * The extended Tools version is the current Tools version with the