Merge pull request #352 from john-hill/PLFM-1709-2

turned off wiki mirroring
Fixes for PLFM-1744, PLFM-1752, PLFM-1754
Merge pull request #358 from john-hill/PLFM-1744

Plfm 1744