CRM-13966 - Switch to entityRef for tagsets