bug 835467 - create v1-train manifest branch
Merge remote-tracking branch 'upstream/v1-train' into atilag-sgs2

Conflicts:
	galaxy-s2.xml