openshift/origin-server — pull request #3732 by rajatchopra (2013-09-27 20:31:33+00:00)
Title: fix bz1012374 , bz1012901 

[merge]