Merge "added salt.minion state before linux.system"