bug 835467 set default manifest branch to v1-train r=cjones
Bug 835690 - Reduce the profile.sh stabilization wait time - v2
Merge pull request #198 from dhylands/dhylands-835690-profile-stabilization

Bug 835690 - Reduce the profile.sh stabilization wait time - v2 r=cjones
Merge remote-tracking branch 'upstream/master' into atilag

Conflicts:
	config.sh