1812326-1
1935334-4
Issue #1812326 by queenvictoria: updated hook_flag_link_types to hook_flag_link_type_info as per Flag 3.x.
Use our own term for Lists.
Fix merge conflict.