Merge "Block inheritance by default on per-branch permissions."