fix version mismatch between broker/node for personal carts; some more safety for yaml downloads
Merge pull request #2335 from rajatchopra/master

Merged by openshift-bot