I upgraded from 17.04 to 17.10 on a Lenovo T540p which has broken two finger touchpad scrolling and right clicking

Trackpad two finger scrolling and right-click issue with Ubuntu 17.10 (i386, 64bit, GNOME 3.26.1) on a Lenovo T540p (the model with a Intel Core i5-4210M Haswell CPU etc)