point l10n at versioned branches; start work on combining mapfiles