Merge "[qca-nss-drv] cleanup in NSS CAPWAP"