work in progress
actually canonicalize
add toString for test ease
work in progress
actually canonicalize
add toString for test ease
data fixes
add the GPG version
Actually test canonicalize
Merge remote-tracking branch 'artbristol/functional-testing-canonicalize'

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
add diffKeyrings method
use KeyringTestHelper.diffKeyrings method for unit test
add diffKeyrings method
use KeyringTestHelper.diffKeyrings method for unit test

Conflicts:
	OpenKeychain/src/test/java/tests/UncachedKeyringTest.java
(c) headers, tidy imports
prevent odd ambiguous method toString error
actually provide a tostring
put unit tests into external module (CAVEAT)

this requires a more up to date version of gradle-android-test-plugin
than is currently in the repositories. it must be added to the local
maven repo using ./install-custom-gradle-test-plugin.sh before
compiling.
Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-badsignature' into external-test

Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
tests: fix createkey test