contint: java definitions are now in the module

The java {} define a Package['openjdk-7-jre-headless']  which is used
in jenkins::slave. So whenever we apply both ::jenkins and
::jenkins::slave we end up with a duplicate definition of
Package['openjdk-7-jre-headless'].

Change-Id: Ibf8f42541b8792349b9ec35ba91c79c6d8403f97
Merge "contint: java definitions are now in the module" into production