Improve resource ordering for puppetmaster