Merge pull request #3646 from tano-systems/pr/luci-base-dispatcher-cbi-config