Merge "modify the owner so that modify the sudoers locally." into stable/brahmaputra