sync with develop, get rid of faulty libxcb easyconfig

Required to make unit tests pass