Fixing broker extended
Merge pull request #3785 from danmcp/master

Merged by openshift-bot
Reenable haproxy-status

Set haproxy status endpoint protocol to http so the haproxy-status page
is exposed again
Merge pull request #3789 from ncdc/reenable-haproxy-status

Merged by openshift-bot
corrected plural links and general code clean-up
updated REST API docs
disable artifact_url
Require deployment_id on activate
Update docs