Merge "add 'reupload-own' right to list of available rights"