MIFOSX-1313 : client incentive code cleanup
Merge pull request #945 from pramodn02/latest

MIFOSX-1313 : client incentive code cleanup