v21.02.2
imagebuilder: fix local packages/ folder
merge: targets: update image generation and targets