Merge change 10313

* changes:
  Fix Configuration documentation for new constants