Carry through local constant changes.
Add a copy of the old constant, as "deprecated"...
Coding standards.
Merge pull request #146 from adam-vessey/7.x-constants

Update constants.
Merge remote-tracking branch 'origin/7.x' into 7.x-features-integration
Coding standards.