Merge pull request #634 from john-hill/PLFM-2143

Plfm 2143
not sure why this is failing on the build machine, but not in local builds. I don't see how this would make any difference.
Merge pull request #637 from jay-hodgson/develop

Not sure why this is failing on the build machine, but not in local buil...
Fix build
Merge pull request #638 from jay-hodgson/develop

Fix build
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into PLFM-2120
logging directory is discoverd from Log4J now
changed bean timing
Merge branch 'release-11' into PLFM-2120
Merge pull request #642 from john-hill/PLFM-2120

Plfm 2120