(PUP-2999) Fix jvm-puppet acceptance tests

Currently there are a few acceptance tests that are not working for jvm-puppet. I took waynr's commits and rebased them with master so that they could be merged.

These commits fix the tests and skip tests that are not applicable for jvm-puppet and are ready for merge into master.