update to accomodate chef 11
Merge branch 'master' of https://github.com/joeracker/designate_dev

Resolve conflicts