Merge remote-tracking branch 'upstream/master' into dhaselva/N2k_fex

# Conflicts:
#	aci-preupgrade-validation-script.py
#	docs/docs/validations.md

Author: monrog2

aci-preupgrade-validation-script.py

@@ -38,7 +38,7 @@
 import os
 import re
 
-SCRIPT_VERSION = "v4.1.0-dev"
+SCRIPT_VERSION = "v4.2.0-dev"
 DEFAULT_TIMEOUT = 600  # sec
 # result constants
 DONE = 'DONE'