push up to version 2.5

and all changes since last version from Aug 28

and fix the update script to do extinfo not just on
mediawikis table

Change-Id: I2d8ac4618e7ac3d545765b6b4dd2dc8e383d695e