Merge pull request #45 from mpath/master

Merging masters
Added max allocation migration
Merge pull request #34 from roaet/RM3473_maxallocation_migration

Rm3473 maxallocation migration