backport from trunk (rev #9739)

fixed the tcp_persistent_flag to accept named flags as well
backport from trunk (rev #9740)

fixed branch route name