Merge "More correct startup and shutdown procedures." into nyc-mr2-dev
tree: fefcecfe80eb741d2ba9b272660ee3f5b68009cf
  1. core/
  2. services/
  3. tests/