#143 moved more tarbal stuff to jdk 1.7 only so that we get the gateway stuff included