Merge pull request #552 from e-cuellar/5.2

5.2
[PMD-987] Fixed metadata import and broken unit test