SWC-1340: fix team list spacing
Merge pull request #940 from jay-hodgson/release-40

SWC-1340: fix team list spacing
from release-40
revert pom
fix pom
Merge pull request #941 from jay-hodgson/develop

merge from release-40