FL-1635: FL-1629: fix ebuild merging in merge script, slight organizational improvement of InsertEbuilds.