Merge "[SDNC] broken handling of aaiclient.properties"