Reworked fixes from previous two commits.

* Updated make shell to be bash (instead of sh) so that conditional
  tests work when sh is not just bash.
* Fixed parsing and checking of JUnit version.