ipt-toolkit puppet ordering fixes