Merge "Manage minion.d using support metadata"