routing spi changes
Merge pull request #3686 from rajatchopra/new_master

Merged by openshift-bot