v2 cart cleanup
Merge pull request #1709 from bdecoste/master

Merged by openshift-bot