Add squash field to UserMergeBranch RPC

Edited by Jerry Seto