fix Fatal Error when save configurable product in Magento 2.2.5 #18082#18461

magento-engcom-team merged 2 commits intomagento:2.2-developmagento/magento2:2.2-developfrom

thiagolima-bm:issue/18082thiagolima-bm/magento2:issue/18082Copy head branch name to clipboard