Fourth level of fixes due to wapcaplet design changes during Rust v0.7 migration
Merge branch 'upgrade-0.7' of https://github.com/webconvforge/sri-delhi-rust-libcss into upgrade-0.7