[PPP-3237] - Updated the GettingStartedDB.spring.xml to use a new constructor. This was causing issues only when deployed to JBoss container
Merge pull request #1369 from rmansoor/master

[PPP-3237] - Updated the GettingStartedDB.spring.xml to use a new constructor.
[BISERVER-10957] - Manual deployment to JBoss 6.1.0 EAP (JBoss 7.2 AS Final) returns error on Login Page
Merge pull request #1371 from brendan-lynch/biserver-10957

[BISERVER-10957] - Manual deployment to JBoss 6.1.0 EAP (JBoss 7.2 AS Fi...
BISERVER-10086 - Warning message for renaming a file says Dont instead of Don't (might be JavaScript issue)

changed to "Do not"
BISERVER-10086 - Warning message for renaming a file says Dont instead of Don't (might be JavaScript issue)

changed to "Do not"

Conflicts:
	user-console/source/org/pentaho/mantle/public/browser/messages_en-US.properties
	user-console/source/org/pentaho/mantle/public/browser/messages_en.properties
BISERVER-10086 - Warning message for renaming a file says Dont instead of Don't (might be JavaScript issue)

changed to "Do not"

Conflicts:
	user-console/source/org/pentaho/mantle/public/browser/messages_en-US.properties
	user-console/source/org/pentaho/mantle/public/browser/messages_en.properties