check
Merge branch 'develop' into PLFM-2390-b
check
check
check
check
check
switched to composition
new controller
Merge branch 'develop' into PLFM-2390-b
java client and integration test
fixed test
Merge pull request #1211 from john-hill/PLFM-2390-b

Plfm 2390 b