Judge orders new 'matching' policy for some BP oil spill claims