imagebuilder: merge r25078 to align files/ handling with current buildroot