Merge pull request #310 from KurtStam/master

Pull Request fro S-RAMP-229
SRAMP-228 Fix for Ambiguos ArtifactType for Extended Artifacts