new params and some fixes to support puppet >=3.2.x