Bug 1029851 - Tracking bug for 02-sep-2014 migration work. new vcs sync: start syncing aurora to v2.1. r=hwine