more cleanup changes for chef 11, attempt backward compatibility