fix feature test - remove obsolete php/ dir

https://trello.com/c/AK1v0o4x - origin_cartridge_card_57
Report more info about DNS resolution
Merge pull request #549 from VojtechVitek/PHP_DocumentRoot_cartridge_card_57

Merged by openshift-bot
Merge pull request #550 from smarterclayton/add_more_debugging_to_dns_output

Merged by openshift-bot
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].
Bug 1072721: Fix divide by zero and duplicate messages in rhc scp command
Merge pull request #557 from liggitt/bug_1072721_divide_by_zero

Merged by openshift-bot
Automatic commit of package [rhc] release [1.21.3-1].
bump_minor_versions for sprint 42
Bug 1073283: Fix scp when app name is empty or .
Bug 1073326: Add scp to rhc autocomplete
Bug 1073307: Make error message on download failure more generic
Merge pull request #558 from liggitt/scp_fixes

Merged by openshift-bot