Merge pull request #1970 from jeffreythomas/dev

[BACKLOG-732] - FileResource jmeter/doc cleanup
[BACKLOG-602] - Fix for not being able to connect to DI Repository from spoon due to a java version on mac issue.
[BACKLOG-762] DirectoryResource JMeter tests
Merge pull request #1975 from mdamour1976/master

[BACKLOG-762] DirectoryResource JMeter tests
Merge pull request #1972 from rfellows/BACKLOG-602

[BACKLOG-602] - Fix for not being able to connect to DI Repository from spoon due to a java version on mac issue.
[TEST] - Cleaning up a broken Unit Test in extensions.