Merge proposals dependent on lp://staging/~credativ/openobject-addons/elico-7.0-fixes-gap-analysis-template-management

1. elico-7.0-fixes-gap-analysis-template-management
2. Dependent merge proposals