Additional changes for Chef Server 11.08 support