Bug 906840
Merge pull request #1412 from bdecoste/master

Merged by openshift-bot
Fix permissions for db files.
Allow for a __default__ target which matches hosts not otherwise matched.
Move the broker-only configuration below node in priority.
Merge pull request #1414 from rmillner/US3143

Merged by openshift-bot
Relaxing restrictions on ssh key names
Merge pull request #1417 from jwhonce/dev/wip_master

Merged by openshift-bot
Merge pull request #1416 from abhgupta/abhgupta-dev

Merged by openshift-bot
The console should send a locked API version
Merge pull request #1419 from smarterclayton/console_should_send_api_version

Merged by openshift-bot
<oo-diagnostics> fix bug in District methods, redirect httpd broken version to kbase
Bug 912819
Merge pull request #1422 from sosiouxme/diagnostics

Merged by openshift-bot
Tests for node web proxy.
Fixed rhc_ctl_destroy helper to look for correct exit code and run faster
Merge pull request #1423 from bdecoste/master

Merged by openshift-bot
Merge pull request #1425 from mrunalp/dev/ws_test

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.5.4-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.5.4-1].