Merge "test_neutron_resources.py exception handler"