PRD-4976 - Fixing resolve to not include a version number, as PRD does not pick up on that. Also ensured that the docs are resolved only once into the "resource/docs" directory and marked that directory as ignored now.
Merge pull request #393 from tmorgner/PRD-4976

PRD-4976 - Fixing resolve to not include a version number, as PRD does n...
PRD-4968 - Missed one test case.
Merge pull request #394 from tmorgner/PRD-4968-2

PRD-4968 - Missed one test case.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	designer/report-designer-assembly/.gitignore
	designer/report-designer-assembly/build.xml