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

Change-Id: I20512547d577e74a5378b70e15ae7a93c75f1c14
Merge "Taking care of dns, named, rndc name changes in upgrade."