Fix more incompatibiliy when switching from Chef Server 10 to 11.