Merge "apex, functest: Passes DEPLOY_SCENARIO to functest"