Attempt to make Jonas distrib smaller to have faster staging times

Tried to assert removed files
Added template topology.xml
Merge branch 'jonas'