Merge proposals dependent on lp://staging/~elbati/account-consolidation/account_parallel_currency_7_tests

1. account_parallel_currency_7_tests
2. Dependent merge proposals