Merge "Allow version.properties path"