Fix for filtering services via service provider.
Merge remote-tracking branch 'origin/rails3' into rails3