Merge proposals dependent on lp://staging/~therp-nl/magentoerpconnect/6.1-lp1179622-category_set_translate

1. 6.1-lp1179622-category_set_translate
2. Dependent merge proposals