configuration: adjust references to deprecated properties

Various places contain references to deprecated properties.  This is
wrong and they should reference the non-deprecated replacement
properties instead.

This patch fixes this.  It is a combination of two patches committed to
master: 9f26723122 and fed4abd3cc, but modified as some of the one-of
values in the property annotations are still needed.

Request: 2.10
Request: 2.9
Request: 2.8
Request: 2.7