Bug 960291
Merge pull request #2362 from rajatchopra/master

Merged by openshift-bot
Merge pull request #2365 from bdecoste/master

Merged by openshift-bot
Bug 958892
Bug 958892
Merge pull request #2366 from rajatchopra/url_carts_fixes

Merged by openshift-bot
Merge pull request #2367 from bdecoste/master

Merged by openshift-bot