Tidy up I18N + rtl libraries
Refactoring for PSR-0
Update build script to better identify tag/branch
#1259086 - branches sosa of spouse