Merge branch '186/projectone' of https://git.soma.salesforce.com/mrafique/aura into ctatlah/projectone-pending-pull-request-uiScrollerTest

Conflicts:

	aura/src/test/components/uitest/scrollerTest/scrollerTest.cmp
	aura/src/test/components/uitest/scrollerTest/scrollerTestController.js
	aura/src/test/components/uitest/scrollerTest/scrollerTestTest.js
Manually integrating Tariq's scroller automation into master.
Merging origin/ctatlah/master-pending-pull-request-uiScrollerTest into master