GPII-1270:  Simplified contentAwareRouter now that FLUID-5742 has been resolved.
GPII-1270:  Simplified contentAwareRouter now that FLUID-5742 has been resolved.

the-t-in-rtf/gpii-express,the-t-in-rtf/gpii-express,GPII/gpii-express,GPII/gpii-express