Merge "Add support for new schema of deploy salt master."