Various build fixes:
release-2.x.y
2018-03-01, Shawn Napora