views.wallet_journal: try importing ordereddict for Python 2.6 support
Merge remote-tracking branch 'upstream/develop' into develop