Merge branch 'master' into 'update_get_config_for_IBM_NOS'

# Conflicts:
#   sa/profiles/IBM/NOS/get_config.py
9 jobs for update_get_config_for_IBM_NOS in 15 minutes and 11 seconds (queued for 4 seconds)