merge back changes rgevaert

Do not use hard dependancies because it is already in init.pp