Bring 1.4.7 2i AAE fixes to 2.0
Merge pull request #817 from basho/bugfix/2i-aae-1.4.7

Bring 1.4.7 2i AAE fixes to 2.0