Use a 1h timeout for testng tests
[DVI-278] Add maven support - Add more resource file types (cherry-picking)

from commits:
 0d00dae620a1b4be60887823ba7f3611c0ddeac7
 311b1b996ccbc26f3ba2aac4344e11f38954f8a5
 3edcedfaae95088dd037ac37d145647a72e81553
 644572afe18964e2d684d38a5405007ef8e95234
Merge branch develop into dev/v1.1.x

Conflicts:
	common/common.xml
Fix for bade paste in the ecache config
Merge commit '4550bcf117c63d39ad6672e6852bad4e3be0f730' into v1.1.x
Altering names of linked .properties files following refactoring
cherry-pick from commit 19d5ff0fa0
Remove v1.0.x specific code for locating the JVM
Upgrade to AI9.4 and don't use GUIDs on parameterized registry keys.
Don't create a new hsqldb for the (empty) market data database
Fix errors populating database and starting service when installing Bloomberg examples.
change default install directory from OpenGamma to opengamma
Rename OG-Production to OG-Integration.
[PLAT-2526] Suppress merge module references when features are disabled. (cherry-picking from commit a6c8b7cef213bd60c21d801bbd3f667819129e3a)
[PLAT-2543] save latest unique identifier of portfolio when creating example view definitions
Set build number before altering feature states (cherry-picking from commit bb0f036b9acf8da6711617c6f263a18d426c50b2)
Revert "cherry-pick from commit 19d5ff0fa0"

This reverts commit c39d934bc49926272f46466e3f6d441720472699.
[PLAT-2499] modified Ehcaching of master config source to clear the cache when underlying docs are updated or corrected
[PLAT-2358] removed Local volatility view from OG-Examples
[PLAT-1499] Use Element.getObjectValue() instead of getValue()
Fix problem with some java complier complaining about type T cannot be determined