Reported issue related mostly to UserRosterManagemet* ad-hoc groovy scripts, which called in succession .addBuddy() and .setBuddySubscription() causing two calls to .saveUserRoster(). I extended .addBuddy() with subscription parameter. Non-script usage won't see much benefit from this change due to more intricate logic regarding handling roster manipulation and handling subscription in Presence plugin.