merge in nyc-mr2-release history after reset to nyc-mr2-dev
tree: 27576e082aab31877ee674463f96678f82440d7c
  1. service/
  2. tests/