fix governance test
use latest ion-defs
Merge pull request #1068 from ifreecarve/2013-05-12_rollups

Add back 2 missing commits from previous PR