always meet control error when restartstop a jbossews scalable app with
medium or large gear size

https://bugzilla.redhat.com/show_bug.cgi?id=1124361
Merge pull request #5678 from bparees/jboss_pid_kill

Merged by openshift-bot
Allow customizing the content-type and accept headers for oauth calls
Merge pull request #5680 from jwforres/oauth_custom_headers

Merged by openshift-bot