Move the internal minion representation to match v1beta3

@ddysher review please, this includes removing the duplicate Labels

Extracted from #1600