Consolidated config, fixed bug in addWarning()

* One method to determine if config is applicable to the current request
* Incorrect placement of the return statement in the addWarning()
* Spacing in a few places

Change-Id: I05a099db2f23f17f2aab27389e89e7bf1ab503ff
Merge "Consolidated config, fixed bug in addWarning()"