fixing rebase

fix rebasing conflicts

change server to broker

change server to broker
Merge pull request #1669 from tdawson/tdawson/minor-spec-cleanup/2013-03-15

Merged by openshift-bot