merge prod-> default
Bug 962853 - vcs-sync needs to populate mapper db once it's live,r=aki
Merging from default

changeset:   2865:7e8ef8b5dd31
parent:      2859:74f415324874
parent:      2864:757e2706bbc6
user:        Aki Sasaki <asasaki@mozilla.com>
date:        Mon Jun 16 15:54:30 2014 -0700
summary:     merge prod-> default

changeset:   2866:19ab422fd4c1
tag:         tip
user:        Peter Moore <pmoore@mozilla.com>
date:        Tue Jun 17 15:05:40 2014 +0200
summary:     Bug 962853 - vcs-sync needs to populate mapper db once it's live,r=aki

--HG--
branch : production