Revert all changes since the last merge point.

This is a 'git merge -s ours', to revert the old changes in one go.
Correct broken links to C++ standard papers. Refs #9212.

[SVN r86524]