Fix amo issues part one

[daveschaefer]

This commit is based on work by Alexey Vesnin. It fixes all of the amo_blocker issues except for the preference migration (which will be updated by itself in its own release to make testing and migration easier).

Thanks Alexey!