PIM-1207 Order attribute options correctly in product form