Bug 559136 - add flags to control stop of context when using memory service
2 files changed