Handle return codes better so we don't make any wrong turns in processing non-existent route services
Reverse previous patch and change test for routing service policy