Merge branch 'develop' of https://github.com/magento/magento2 into MAGETWO-33535

Author: Vladyslav Shcherbyna

app/code/Magento/Theme/etc/config.xml

@@ -22,11 +22,8 @@
 User-agent: *
 Disallow: /index.php/
 Disallow: /*?
-Disallow: /*.js$
-Disallow: /*.css$
 Disallow: /checkout/
 Disallow: /app/
-Disallow: /js/
 Disallow: /lib/
 Disallow: /*.php$
 Disallow: /pkginfo/