Merge "Move --jar function out of JarHostTest" into pi-dev