Various fixes to CNBannerChoiceDataResourceLoaderModule

Still missing fix for getModifiedTimestamp

Change-Id: I1e9651439966127a150cdcfe816e3a51f3924a94
Merge "Various fixes to CNBannerChoiceDataResourceLoaderModule"