Merge "fix AAI data-router and es mapping"