upgrade salt and setuptools to fix #2119