Merge pull request #13405 from peter-stadler/nginx-util-uci