merge latest license changes from Countly master