Merge proposals dependent on lp://staging/~yann-papouin/ocb-server/6.1-bug-1172156-bank-format-layout-translation

1. 6.1-bug-1172156-bank-format-layout-translation
2. Dependent merge proposals