Merge "Revert "Enforced salt version 2016.3 for ubuntu""