Merge proposals dependent on lp://staging/~sbi/ocb-addons/6.1-analytic-entry-without-general-account

1. 6.1-analytic-entry-without-general-account
2. Dependent merge proposals