Tolerate several things that can be broken in Org configuration

Various forgiving changes to allow gu-who to run against https://github.com/gu-who-test-org - finally runs ok!