Merge pull request #4658 from nickberry17/update_luci_watchcat