Separate 'user' and 'branch' for tools and appscale.