BZ914838: Fix uri parsing.
Fix for bug 915638
  We are not logging the user credentials in the log file
Merge pull request #1515 from mrunalp/bugs/914838

Merged by openshift-bot
remove chown/chmod, errors in mock with Operation Not Permitted, %files section should satisfy this
Merge branch 'master' of github.com:openshift/origin-server

* 'master' of github.com:openshift/origin-server:
  BZ914838: Fix uri parsing.
Automatic commit of package [openshift-origin-node-proxy] release [0.6.5-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.5.11-1].
Fix for issue identified by lnader where force_delete fails for a user with domains
Merge pull request #1516 from abhgupta/abhgupta-dev

Merged by openshift-bot
Merge pull request #1518 from danmcp/master

Merged by openshift-bot
Merge pull request #1519 from abhgupta/abhgupta-ssh-keys

Merged by openshift-bot
WIP Cartridge Refactor - improve robustness of oo_spawn

* Update cartridge writing guide
* Create HOME environment variable by default
* Skip teardown script that is not executable
* oo_spawn monitors stdout/stderr/exitstatus of children for termination
Merge pull request #1520 from jwhonce/wip/master

Merged by openshift-bot
Bug 916941 - Keep created time in sync when creating UsageRecord and Usage mongo record
Merge pull request #1522 from pravisankar/dev/ravi/bug916941

Merged by openshift-bot
oo-admin-ctl-usage fixes
Merge pull request #1523 from pravisankar/dev/ravi/us3409-fixes

Merged by openshift-bot