Merge "Revert "Run salt.minion and full refresh consistently"" into release/proposed/2019.2.0