Merge "Add namespace before attr name in defPropMap" into nyc-dev