Set the OpenID timeout to 10 minutes if deployment is DEV
Optimise imports
Merge branch 'master' into dev-faciatool-timeout