Merge branch 'develop' into FearlessKiwis-MAGETWO-59785-IncorrectUrls-in-sitemap

* develop: (147 commits)
  MAGETWO-62855: Copyright Year Update 2017
  MAGETWO-62855: Copyright Year Update 2017
  MAGETWO-62855: Copyright Year Update 2017
  MAGETWO-62855: Copyright Year Update 2017
  MAGETWO-62855: Copyright Year Update 2017
  MAGETWO-62855: Copyright Year Update 2017
  MAGETWO-62850: API for price update: Special price
  MAGETWO-62902: Bundle and custom options of type file not converted
  MAGETWO-62134: Create data converter that can process nested serialized data
  MAGETWO-62134: Create data converter that can process nested serialized data
  MAGETWO-62134: Create data converter that can process nested serialized data
  MAGETWO-62134: Create data converter that can process nested serialized data
  MAGETWO-62134: Create data converter that can process nested serialized data
  MAGETWO-62253: Refactor code to remove unserialize
  MAGETWO-62134: Create data converter that can process nested serialized data
  MAGETWO-62134: Create data converter that can process nested serialized data
  MAGETWO-62253: Refactor code to remove unserialize
  MAGETWO-62253: Refactor code to remove unserialize
  MAGETWO-62133: Create QueryModifier to select only options of type file and info_buyRequest
  MAGETWO-62133: Create QueryModifier to select only options of type file and info_buyRequest
  ...

# Conflicts:
#	app/code/Magento/Sitemap/Model/Sitemap.php
#	app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php