Merge branch 'chef-dk-227' into 11-stable
Fix conflicting data in test cases
Add another case for chef-dk#227 to ensure regex correctness