Upgrade to salt 0.17.4; various related and unrelated fixes.