Merge "Fixes bug 992149-Some new tests to test_keypairs.py and test_authorization.py"