[BACKLOG-610] - CLONE - OSGIBoot writes invalid URL to log4j.xml on manual deployment

url should start with "file:/", not "file://"
Merge pull request #1987 from aliakseihaidukou/BACKLOG-610

[BACKLOG-610] - CLONE - OSGIBoot writes invalid URL to log4j.xml on manu...
[BACKLOG-744] - Fixed mime type definitions. Using the PRPT Import handler to import PRPTs
Merge pull request #2008 from rmansoor/master

[BACKLOG-744] - Fixed mime type definitions.
[BACKLOG-732] Added additional assertions to JMeter tests
Merge pull request #2010 from bmorrise/dev

[BACKLOG-732] Added additional assertions to JMeter tests
[BACKLOG-503] File Resource oemdoc updates use jmeter request and response.
Merge pull request #2013 from scottyaslan/devBranch

[BACKLOG-503] File Resource oemdoc updates use jmeter request and respon...
[BACKLOG-775] log4j error message on server startup
Merge pull request #2015 from mdamour1976/master

[BACKLOG-775] log4j error message on server startup
[BACKLOG-10] Added messages to the request and response blocks that are intentionally left blank to add clarity to the OEM Documentation.
Merge pull request #2017 from brendan-lynch/master

[BACKLOG-10] Added messages to the request and response blocks that are ...
[BACKLOG-755] -- Added unit test to compare comments with @Path annotations
Merge pull request #2019 from krivera-pentaho/dev

[BACKLOG-755] -- Added unit test to compare comments with @Path annotati...
[BACKLOG-755] -- update to conform with method signature change in pentaho-jmeter project
Merge pull request #2020 from krivera-pentaho/dev

[BACKLOG-755] -- update to conform with method signature change in penta...
BISERVER-11724 JcrRepositoryFileDao class has many code duplicates

JMockit dependence added
JUnit test-src/org/pentaho/platform/repository2/unified/jcr/JcrRepositoryFileDaoFacadeTest.java added
BISERVER-11724 JcrRepositoryFileDao class has many code duplicates

refactored
test-src/org/pentaho/platform/repository2/unified/jcr/JcrRepositoryFileDaoTest.java added
BISERVER-11724 JcrRepositoryFileDao class has many code duplicates

test-src/org/pentaho/platform/repository2/unified/jcr/JcrRepositoryFileDaoFacadeTest.java was deleted as duplicated