Merge "Add info on clustered RPCs to controller dev-guide"