Uncomment deprecation decorator and bump removal version to Sodium
Uncomment deprecation decorator and bump removal version to Sodium

I also added a couple of blank lines to the code-block references.
The docs weren't rendering these sections because of the missing
blank lines.

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt