Backport 2.0.1 AAE improvements

This is a prerequisite for the backporting of a number of MDC
improvements done in the 2.0.X series to prepare a 1.4.11 release.
This version passes the AAE riak_test.
Update to build files to get test-riak_kv builder happy.
Merge pull request #1032 from basho/feature/backport-2.0.1-AAE-improvements

Backport 2.0.1 AAE improvements