Merge "Revert "Neutron&Designate DNS integration - some enhancements""