Merge "removed the AAIPropertiesConfiguration file"