Merge pull request #305 from bphinz/xorg-118

Update xenial build to account for distro-specific xorg patches