Fixed Issue:

- MAGETWO-56133 Prevent new code from including unsecure functions

Fixed Issues:

- MAGETWO-58670 Unable to go to PayPal side from first attempt after applying discount on checkout
- MAGETWO-58997 Copy past detector fails in Vault module
- MAGETWO-59033 [Github] Authorize.net doesn't allow to use JCB and Diners Club credit cards
- MAGETWO-59187 Magento\Checkout\Test\TestCase\OnePageCheckoutTest fails on variation OnePageCheckoutUspsTestVariation2

Story:
- MAGETWO-54693: Ability to return the product to the stock after Creditmemo API
Fixed Issues:
- MAGETWO-58479: [Github]Magento 2.1.0: db fields with mysql default value CURRENT_TIMESTAMP cannot be updated through the EntityManager #5385
- MAGETWO-56065: [Staging] [Flat] Filter Exception
- MAGETWO-52378: [GitHub] WYSIWYG Editor strips empty HTML codes out #4324

- MAGETWO-47698: [Github] Custom options not displayed correctly on a store view level #2908 #5885
- MAGETWO-56411: [GitHub] Shopping cart product options missing #248 
- MAGETWO-58242: Issue with an Import Export when Attribute Changes
- MAGETWO-58053 [GITHUB] Product image issue with multiple store views Magento 2.1.0 #6259

[Mavericks] Extend functional tests

- merge mainline

[Falcons] Bug fixes for Import/Export, Travis

- merge commit

- merge commit with conflict: dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml

Fixed issue:
 - MAGETWO-55867 Date and time are shown incorrectly for staging updates

[Mustangs] Measure Search

Adding static test