Patches from Ag
Fixing CORDEX tests -- wrong interpretation of rcm_model
Fixing imports in test_p_cmip5