Merge "removing /onap/so/infra from properties"