Merge pull request #726 from magento-fearless-kiwis/FearlessKiwis-MAGETWO-59785-IncorrectUrls-in-sitemap

Fearless kiwis magetwo 59785 incorrect urls 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

Fixed issue:
- MAGETWO-62855: Copyright Year Update 2017

# Conflicts:
#	app/code/Magento/Catalog/Model/Product/Price/TierPriceValidator.php
#	app/code/Magento/Catalog/Test/Unit/Model/Product/Price/TierPriceValidatorTest.php

Task:
- MAGETWO-62850: API for price update: Special price

--fix ModuleDbChanged test

--fix ModuleDbChanged test

--fix ModuleDbChanged test

Fixed issue:

- MAGETWO-60420 Remove uses of serialize/unserialize in \Magento\Backend\Model\Menu\Config

* develop:
  MAGETWO-62919: Update the year in the copyright
  MAGETWO-62486: Refactor Layout to store data from object only and restore object
  MAGETWO-62486: Refactor Layout to store data from object only and restore object
  MAGETWO-62486: Refactor Layout to store data from object only and restore object
  MAGETWO-62514: Remove uses of serialize/unserialize in \Magento\Framework\App\PageCache\Kernel
  MAGETWO-62486: Refactor Layout to store data from object only and restore object
  MAGETWO-62514: Remove uses of serialize/unserialize in \Magento\Framework\App\PageCache\Kernel
  MAGETWO-62514: Remove uses of serialize/unserialize in \Magento\Framework\App\PageCache\Kernel
  MAGETWO-62514: Remove uses of serialize/unserialize in \Magento\Framework\App\PageCache\Kernel
  MAGETWO-62514: Remove uses of serialize/unserialize in \Magento\Framework\App\PageCache\Kernel
  MAGETWO-62514: Remove uses of serialize/unserialize in \Magento\Framework\App\PageCache\Kernel
  MAGETWO-62486: Refactor Layout to store data from object only and restore object
  MAGETWO-62514: Remove uses of serialize/unserialize in \Magento\Framework\App\PageCache\Kernel
  MAGETWO-62514: Remove uses of serialize/unserialize in \Magento\Framework\App\PageCache\Kernel
  MAGETWO-62510: Remove uses of serialize/unserialize in \Magento\Ui\Model\Manager
  MAGETWO-62510: Remove uses of serialize/unserialize in \Magento\Ui\Model\Manager
  MAGETWO-62510: Remove uses of serialize/unserialize in \Magento\Ui\Model\Manager

Fixed issues:

- MAGETWO-58551 Remove uses of unserialize in Module_Quote
- MAGETWO-58455 Remove uses of unserialize in \Magento\Framework\Model\ ResourceModel\Db\AbstractDb and its child classes and their usages
- MAGETWO-58463 Remove uses of unserialize in Module_Sales
- MAGETWO-61872 Create FieldDataConverter
- MAGETWO-62133 Create QueryModifier to select only options of type file and info_buyRequest

Fixed issues:

- MAGETWO-60418 Remove uses of serialize/unserialize in \Magento\Framework\App\PageCache\Kernel
- MAGETWO-60423 Remove uses of serialize/unserialize in \Magento\Framework\View\Layout
- MAGETWO-60419 Remove uses of serialize/unserialize in \Magento\Ui\Model\Manager
- MAGETWO-62919 Update the year in the copyright

* develop:
  MAGETWO-62968: Mark unstable test "RegisterCustomerFrontendEntityTest"
  MAGETWO-62856: JSUnit job is failed on current mainline
  MAGETWO-62856: JSUnit job is failed on current mainline
  MAGETWO-52856: [WebAPI] Improve WebAPI performance of Checkout Payment Info/Place order call

Story:
- MAGETWO-52856: [WebAPI] Improve WebAPI performance of Checkout Payment Info/Place order call
Bug:
- MAGETWO-62856: JSUnit job is failed on current mainline
Task:
- MAGETWO-62968: Mark unstable test "RegisterCustomerFrontendEntityTest"

* develop:
  MAGETWO-60765: Error is thrown while scheduling an update for a locale different that US_en
  MAGETWO-60765: Error is thrown while scheduling an update for a locale different that US_en
  MAGETWO-60002: Update functional test handler to avoid code duplication
  MAGETWO-62237: [Github][PR] Blank theme: Fix sorter icon changing #7628
  MAGETWO-62237: [Github][PR] Blank theme: Fix sorter icon changing #7628
  MAGETWO-60765: Error is thrown while scheduling an update for a locale different that US_en
  MAGETWO-60765: Error is thrown while scheduling an update for a locale different that US_en
  MAGETWO-60765: Error is thrown while scheduling an update for a locale different that US_en
  MAGETWO-60478: Invalid SalesInventory module version - 2.2

Fearless kiwis magetwo 60765

Fixed issues:
- MAGETWO-60478: Invalid SalesInventory module version
- MAGETWO-60002: Adding attribute to return gives errors
- MAGETWO-62237: [Github][PR] Blank theme: Fix sorter icon changing #7628

MAGETWO-59785: Incorrect URLs in sitemap when generated from admin with 'Use Secure URLs in Admin' = Yes
Updated copyright year to 2017

MAGETWO-59785: Incorrect URLs in sitemap when generated from admin with 'Use Secure URLs in Admin' = Yes
Removed '_' from variable name.

- Removed code duplication