BATCH-1950: Patch up build

* Ensure bundlor is available and remove from sample
* Tidy dependencies in some poms