Merge branch '2802-fix-sitemap' of https://github.com/rodrigowebjump/magento2 into 2802-fix-sitemap

Author: JosephMaxwell

.gitignore

@@ -5,8 +5,11 @@
 /.settings
 atlassian*
 /nbproject
+/robots.txt
 /sitemap
 /sitemap.xml
+/pub/sitemap
+/pub/sitemap.xml
 /.idea
 /.gitattributes
 /app/config_sandbox