Fix blatant bug in salt.utils.option
Merge remote-tracking branch 'upstream/develop' into develop