master
Ticket [ce17795a78]. tar, json - Moved support files around into places where they will not be picked up by the installer.
Merge test fixes from trunk, plus local fixes for small localPath breakage.