Merge changes Ie3388e00,I445552d5

* changes:
  Update cookbook plugin to latest revision
  Organize imports