Merge "Drop reclass/salt-master strict dependencies"