Adapt monitor calls to subscription model.
Merge branch 'admin2' into merge
Removed calls to old monitor API; removed whitespace.
Merge branch 'admin2'