openshift/origin-server — pull request #5101 by jwhonce (2014-03-28 00:36:15+00:00)
Title: [DO_NOT_MERGE][TO_STAGE] bug/1081249 and bug/1081441

Catch stage up to master for late breaking bugs