Bug 873180
Bug 873181
Bug 884456
Bug 874932
Bug 870377
Give proper error for cart missing vs app
Bug 903551
Merge pull request #1222 from danmcp/master

Merged by openshift-bot
Bug 876087
make test react to weirdness of controller
Merge pull request #1223 from danmcp/master

Merged by openshift-bot