Fixing tests
Merge pull request #552 from danmcp/master

Merged by openshift-bot
Automatic commit of package [rhc] release [1.21.1-1].
Use more than 1 word
Merge pull request #554 from danmcp/master

Merged by openshift-bot
fix cucumber test cartridge index files
Merge pull request #555 from VojtechVitek/fix_index_files

Merged by openshift-bot
Automatic commit of package [rhc] release [1.21.2-1].
Merge remote-tracking branch 'upstream/master'