Don't append duplicate text to Makefile.am
Fix: Don't regenerate signing key
Merge branch 'fix-regeneration-issues' into p-master