contrib: add support for v1.8 branch, add getopt aliases