Merge proposals dependent on lp:~openbig/bigconsulting/changes_to_generate_ean_for_packaging

1. changes_to_generate_ean_for_packaging
2. Dependent merge proposals