XX-10816 BOSH fixes from upstream