[PLAT-3509]
Merge remote branch 'refs/remotes/origin/develop' into develop

Conflicts:
	projects/OG-Analytics/src/test/java/com/opengamma/analytics/financial/credit/creditdefaultswap/pricing/vanilla/isda/ISDAModelDatasets.java
[PLAT-3566]
Merge remote branch 'refs/remotes/origin/develop' into develop