[backfire] merge all uhttpd changes from trunk