Merge "Add a new permission to permit rebasing changes in the web UI"