Merge pull request #1918 from apache/abderrahim/alias-mapping-fix

Keep track of the parent alias when aliases are mapped