Change the defaults to be backwards compatible (fix #13285)

[jacksontj]

@thatch45 this makes the change backwards compatible.

[ghost]

Test Failed.

If the failures are unrelated to your code, don't stress, a core developer will know these apart.
In the future, if possible, please branch off a passing commit to avoid false positives.
Refer to this link for build results: http://jenkins.saltstack.com/job/salt-pr-build/5919/

[thatch45]

Thanks!