Merge changes I73d7eb34,I52ced26c

* changes:
  Don't require permissions for high-priority oif rules.
  Minor fixes in RouteController.