Second attempt to update the main branch

[vraevsky]

Added the stuff that was missed while handing over the meta-layer to balena-os.