Taking care of dns, named, rndc name changes in upgrade.

Change-Id: Ifcea244b0851665c9ba9d73e801b457cf9bb73a7
Merge "Taking care of dns, named, rndc name changes in upgrade." into R2.0