Merge pull request #120 from MartyBurns/master

propage John's OpenESPI-Common-jave/etc changes to the test configuratio...