Merge "Skip extraroute tests if extension is not enabled"