Remove the need of running builder-enter & builder-leave

[moul]

• call builder-enter from within all the distrib images
• call the builder-leave from within the Makefile when exporting the image