Use deprecated-removed directive, clean up a few markup issues around
deprecated directives.
Fix a few scoping issues with versionadded/versionchanged directives.
merge with 3.4