Collect/Sync Usage data for EAP cart

bug fixes

More fixes
Merge pull request #1246 from pravisankar/dev/ravi/us2626

Merged by openshift-bot