Customizations for base, all in same patch Change-Id: I310a2f51ece8dfe2a159c40407b5bdb77f7ee021 Partially-implements: blueprint third-party-plugin-support