Fixes required for Vivado 2017.4.#104

hewittc wants to merge 1 commit intoaolofsson:stableaolofsson/oh:stablefrom

hewittc:vivado-2017.4-fixeshewittc/oh:vivado-2017.4-fixesCopy head branch name to clipboard