Merge pull request #5707
14d023f change hardcoded character constants to a set of descriptive named constants for database keys (Earlz)