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