[CHEF-3298] Bugfixes/missing conflicts

see http://tickets.opscode.com/browse/CHEF-3298