Fix carousel_SpinnerTest to be less flappy.
Fix RerenderMarksUITest issue with IE10.
@rev esalman@

Conflicts:

	aura/src/test/java/org/auraframework/perfTest/PerfMetricsTestCase.java
Merging origin/ctatlah/master-pending-testFailureFixes into master