Fix bug 958977
Fix problem in v2_cart_model_test that invalidates accept-node
WIP cuke reorganization
Merge pull request #2460 from ironcladlou/dev/v2carts/cuke-reorg

Merged by openshift-bot