Fix upgrade constants after removing AAF upgrade

Also, remove AAF upgrades on both sides, since the offsets apply to both sides,
so they cannot have different upgrade trees.
Merge pull request #17 from guido2/fix_upgrade_constants_after_aaf_removal

Fix upgrade constants after removing AAF upgrade