Move AAF Poms to 2.1.16