Speeding up tests
Merge pull request #4587 from danmcp/master

Merged by openshift-bot
Speeding up tests
Merge pull request #4588 from danmcp/master

Merged by openshift-bot
Fixing common test case timeout
Merge remote-tracking branch 'origin/master' into cartridges_in_mongo