[sr-dev] git:master: carrierroute: port from 1.5 branch, r5876, remove dead code ( double return)