Merge pull request #613 from magento-goinc/MAGETWO-37174

.../Adminhtml/Product/Edit/Tab/Options/Type/AbstractType.php

.../Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php

app/code/Magento/Catalog/Ui/Component/FilterFactory.php

...log/Ui/Component/Listing/Attribute/AbstractRepository.php

...nto/Catalog/Ui/Component/Listing/Attribute/Repository.php

...og/Ui/Component/Listing/Attribute/RepositoryInterface.php

app/code/Magento/Catalog/Ui/Component/Listing/Columns.php

app/code/Magento/Catalog/Ui/Component/Listing/Filters.php

app/code/Magento/Catalog/etc/adminhtml/di.xml

...ew/adminhtml/templates/catalog/product/edit/options.phtml

...ml/templates/catalog/product/edit/options/type/date.phtml

...ml/templates/catalog/product/edit/options/type/file.phtml

.../templates/catalog/product/edit/options/type/select.phtml

...ml/templates/catalog/product/edit/options/type/text.phtml

app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php

.../CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php

app/code/Magento/CatalogRuleConfigurable/LICENSE.txt

app/code/Magento/CatalogRuleConfigurable/LICENSE_AFL.txt

...Plugin/CatalogRule/Model/ConfigurableProductsProvider.php

...e/Plugin/CatalogRule/Model/Indexer/ProductRuleReindex.php