Merge pull request #2426 from cshoredaniel/pr-luci-app-radicale2