remove ref to esd_??_2014 views, pull in some ESD content type changes