upgraded to nosql 2.1.x. Removed metric that does not exist any more
Added some new 2.x metrics