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