Fix some cases where dev versions of display server client would result in a broken build.
Fix some cases where dev versions of display server client would result in a broken build.

sensics/OSVR-RenderManager,sensics/OSVR-RenderManager,sensics/OSVR-RenderManager