Merge pull request #5631 from coudu/luci-app-nut-fixes