Merge branch 'SWC-471' into SWC-471-patch
SWC-471: fix build (merge issue)
update pom to 1.24 PLFM artifact
update pom
Merge pull request #319 from jay-hodgson/SWC-471-patch

Swc-471 patch merged up from develop
Merge branch 'release-1.25' into develop