fixes to CSMv2 compatibility for luci-commotion-apps