Use default template and package scripts for BFFs
[WIP] updated omnibus and omnibus-software with fixes

This should not be merged!