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