Returning the correct http status in case of unhandled exception
Bug 949819
Merge pull request #1980 from abhgupta/abhgupta-dev

Merged by openshift-bot
Merge pull request #1977 from lnader/master

Merged by openshift-bot
Bug 950224: Remove unnecessary Endpoints
Replace zend with ruby in broker function test as zend is not available on origin.
Merge pull request #1989 from ironcladlou/bz/950224

Merged by openshift-bot
Merge pull request #1990 from kraman/master

Replace zend with ruby in broker function test as zend is not available on origin.