Merge "AAF Docker Build to Maven"