Entity header should always return the version
test of entity header change for SWC-485
Merge pull request #547 from eric-wu/quickfix

Merge ACL patch from release-3 into develop
try to get hudson to work
Merge pull request #548 from john-hill/tools-jar

try to get hudson to work
ignoring test
Merge pull request #549 from john-hill/tools-jar

ignoring test
ignoring test
Merge pull request #550 from john-hill/tools-jar

ignoring test
added null check
Merge pull request #545 from dburdick/swc-485

Swc 485 & SWC-491
added
added tests
Merge pull request #551 from john-hill/PLFM-1998

Plfm 1998
part of SWC-647, Get API key from Synapse java client
Merge pull request #552 from dburdick/swc-647

part of SWC-647, Get API key from Synapse java client
done
Merge pull request #553 from john-hill/PLFM-2005

done