openshift/origin-server — pull request #2851 by lnader (2013-06-14 19:13:39+00:00)
Title: Bug 971204 and 974493 

[test]