Merge remote-tracking branch 'origin/master'
add update branch feature's testcases.
remove resource_id from upadte branch routes.