[BACKLOG-35] -- added build changes and two test cases across two different files for jmeter test generation
Merge pull request #1706 from krivera-pentaho/dev

[BACKLOG-35] -- added build changes and two test cases across two differ...
[BACKLOG-35] -- reverting changes necessary for pentaho-jmeter
Merge pull request #1709 from krivera-pentaho/master

[BACKLOG-35] -- reverting changes necessary for pentaho-jmeter
Merge branch 'oemdoc' of github.com:pentaho/pentaho-platform into oemdoc

Conflicts:
	extensions/ivy.xml
[BACKLOG-194] Rest endpoint refactor and unit test for /repo/files/deletepermanent
[BACKLOG-194] Refactor and unit test for /repo/files/deletepermanent
Merge branch 'oemdoc-dodeletefilespermanent' into oemdoc

Conflicts:
	extensions/src/org/pentaho/platform/web/http/api/resources/FileResource.java
	extensions/src/org/pentaho/platform/web/http/api/resources/services/FileService.java
	extensions/test-src/org/pentaho/platform/web/http/api/resources/services/FileServiceTest.java