agent: Post merge changes that enable building of vnswd.

Post review fixes.