check
Merge pull request #1161 from brucehoff/develop

fix to Spring xml file
Merge pull request #1160 from john-hill/PLFM-2640-b

check
fix to Spring xml file
Merge pull request #1162 from xschildw/xml-fix-port-from-dev

fix to Spring xml file
Merge branch 'release-35' into develop