Further impacts of merge.
Merge branch 'develop' of github.com:OpenGamma/OG-Platform into develop