Better warning messages for the block store rollback code. It was printing exceptions for replays and new wallets.
Add testnet checkpoints for WalletTemplate.
Fix JDK8 doclint range to work with JDK7
Fix JDK8 doclint range to work with JDK7 in Orchid
Merge remote-tracking branch 'upstream/master'