Packaging fixes for Chef 11.16.x

/cc @lamont-granquist @adamedx