Render errors better on restart
Merge branch 'master' of github.com:openshift/origin-server into membership_plus_console