Allow overriding of properties with a system property
Merge branch 'simple-integration-tests' of github.com:guardian/frontend into simple-integration-tests