Abuild keygen fixes

Closed Carlo Landmeter requested to merge github/fork/clandmeter/abuild-keygen-fixes into master

Merge request reports