Port to pkgdb2 while still allowing it to work on pkgdb1 fedmsg messages
Change the order a little: orphaned, retired, unorphaned, unretired, given, new branches