Merge proposals dependent on lp://staging/~pedro.baeza/c2c-rd-addons/7.0-stock-product-location-improvements

1. 7.0-stock-product-location-improvements
2. Dependent merge proposals