MAGETWO-37464: Merge and Fix Builds

 - fix variable name

Author: Cari Spruiell

app/code/Magento/Integration/Test/Unit/Controller/Token/AccessTest.php

@@ -97,7 +97,7 @@ protected function setUp()
             '',
             false
         );
-        $page->expects($this->any())->method('getConfig')->will($this->returnValue(pageConfig));
+        $page->expects($this->any())->method('getConfig')->will($this->returnValue($pageConfig));
         $page->expects($this->any())->method('addPageLayoutHandles')->will($this->returnSelf());
         $page->expects($this->any())->method('getLayout')->will($this->returnValue($layout));