Update to work with newer versions of puppet, add labels and the ability to disable java6 from being installed for slave.