Merge pull request #531 from e-cuellar/master

[BACKLOG-290] REST: Metadata import refactoring as requested by Nick
[BACKLOG-290] Fixed unit tests