Merge "Revert "Disable enforcing scopes in Neutron temporary""