Merge proposals dependent on lp://qastaging/~camptocamp/contract-management/7.0-add-product-attribute-hours-block-mdh

1. 7.0-add-product-attribute-hours-block-mdh
2. Dependent merge proposals