Fixed #1172: Bug - Subdomains - DNS resource records - Conflicts with CNAME records
(cherry picked from commit 4c73e37)
(cherry picked from commit 6ed00d7)