Merge forward

@s0undt3ch and @cachedout there were some merge conflicts in `salt/utils/minion.py` that I resolved, but I am not entirely sure on them. Can you both take a look to make sure I didn't squash any changes incorrectly?