Added swapKeys method from UsageMappingHelper class to a MapUtil class in common module.  Removed UsageMappingHelper class.
Removed commented out code in UsagePollerHelper.