Merge pull request #66 from rmansoor/master

 BISERVER-8345 - Fixing unit test
BISERVER-8343 Modify CommandLineProcessor to also take short option values
Merge pull request #67 from pminutillo/master

BISERVER-8343 Modify CommandLineProcessor to also take short option values
Update extensions/src/org/pentaho/platform/plugin/services/messages/messages.properties

Removed the conflict messages
BISERVER-8170 Fix ACLs not processing on existing folders.
Merge pull request #68 from tkafalas/master

BISERVER-8360 Fix ACLs not processing on folders that already exist.
BISERVER-8285 - Fixing unit test