MIFOSX-518: capture alternative working date
Merge pull request #410 from ashok-conflux/MIFOSX-518

MIFOSX-518: capture alternative working date
Merge remote-tracking branch 'upstream/develop'