Update staging to Bitcoinj 'master' and include Orchid