Rollup commit from ix repo
Sync to r1222: adjust freenas-common to build proper south-enabled db, first cut at upgrade script.
Add migration and fix to integrate south
Move up after last move added extra /ix.
