Merge "Fix sysctl for salt-master optimization" into release/proposed/2019.2.0