Merge "Adding SALT_MASTER_CREDENTIALS to test-virtual-model"