PRD-5121 - Invalid resource name
Merge pull request #421 from tmorgner/PRD-5121

PRD-5121 - Invalid resource name
Merge remote-tracking branch 'upstream/master'