Log Message:
minor fixes for gnupg2 support:
-don't pull in gnupg2's "gpgconf" if both gnupg1 and gnupg2 are installed
 but we are building against gnupg1, this caused a build failure
-fix a selftest to work with gnupg2