aHPSDR: fixed merge conflicts in this opengl-ssl branch