progress
testing one, two, three...
now includes PLFM-1706
fixed a hard coded test
merged conflits
Merge pull request #325 from john-hill/PLFM-1705

PLFM-1705 and PLFM-1706 (migration of wiki and file handles)