TRUNK-4997: Add a global property that enables different behavior here

[ykarim]

Description

Removed TODO.

Related Issue

see https://issues.openmrs.org/browse/TRUNK-4997

Checklist:

• My pull request only contains one single commit.
• My pull request is based on the latest master branch
  git pull --rebase upstream master.
• I ran mvn clean package right before creating this pull request and
  added all formatting changes to my commit.
• My code follows the code style of this project.
• I have read the CONTRIBUTING document.
• I have added tests to cover my changes.
• All new and existing tests passed.

[mention-bot]

@ykarim, thanks for your PR! By analyzing the history of the files in this pull request, we identified @bmamlin to be a potential reviewer.

[coveralls]

Coverage increased (+0.006%) to 55.672% when pulling 9d96089 on ykarim:TRUNK-4997 into 2d84136 on openmrs:master.