Re-import countly 2.0.0

Re #7029