Merge "Fixed incomplete OSEN config code." into nyc-dev
tree: 6025ff515fc2b18780336c6bced15e5b5383c8c9
  1. service/
  2. tests/