Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Configuration: Fix logging arguments should not require evaluation
  Configuration: Move constants to corresponding classes

Change-Id: If06e650b36f17e82975271a7bf60e7e741207fe0