fix HER-2059 with commons-httpclient workaround