Office 2013, tweak auto tune
Fix an issue with --skip-self-tests and dynamic salts.