merge avhttpd update from QVOD2 internal product