Attempt to move puppetlabs-apt submodule to apt.
Switch java to 7terminals version in attempt to get sun java.