fix bug 1122339
https://bugzilla.redhat.com/show_bug.cgi?id=1122339
add detection to make sure node_platform is not nil before casecmp
move xpaas cucumber tests upstream
Merge pull request #5762 from bparees/xpaas_tests

Merged by openshift-bot
Merge pull request #5663 from sztsian/master

Merged by openshift-bot