changed from hardcoded wrong paths, to relative correct ones
dropping bit 1096 CPA into pickup should now work with the fullcontainer virgo startup plan
merge with upstream Testing_Release_1.0
Merge branch 'Testing_Release_1.0' of github.com:societies/SOCIETIES-Platform into Testing_Release_1.0_CPA1096FIX
Merge branch 'Testing_Release_1.0_CPA1096FIX' into Testing_Release_1.0
Merge branch 'Testing_Release_1.0' of github.com:societies/SOCIETIES-Platform into Testing_Release_1.0
added classpath addition to pubsub client in activityfeedservice startup
merge with upstream
Merge branch 'Testing_Release_1.0' of github.com:societies/SOCIETIES-Platform into Testing_Release_1.0
Merge with upstream.

Merge branch 'Testing_Release_1.0' of github.com:societies/SOCIETIES-Platform into Testing_Release_1.0
merge with upstream.

Merge branch 'Testing_Release_1.0' of github.com:societies/SOCIETIES-Platform into Testing_Release_1.0