[chef] 11.6.0 on Solaris and line feeds in files rendered from templates

[< >]

I tried using chef.11.6.0-1.solaris2.5.10.i386.solaris on Solaris 10 today, 
but
I found that when a template source file containing line feeds such as the
following:

domain <%= @domain %>^M
search <% @search_domains.each do |search_domain| -%><%= search_domain %> <%
end -%>^M
<% @nameservers.each do |nameserver| -%>^M
nameserver <%= nameserver %>^M
<% end -%>^M

The rendered file also has the line feeds:

domain xyz.com^M
search xyz.com ^M
nameserver 10.nnn.nn.nn^M

Such garbage in the rendered files causes the resolver to fail.

With 11.4, the rendered file is free of the line feeds and the resolver works
as expected.

Has anyone noticed this issue with 11.6 in general and/or specifically on
Solaris?

Is there a workaround?  Or perhaps this is a case of garbage in and garbage
out? i.e. the behavior in 11.4 is masking the need for us to ensure that the
template files don't have this style of new line?