merge in honeycomb-release history after reset to master
tree: 2c4ad96610b8b6bdc3f59b40c156aa2d165ac13d
  1. core/
  2. services/