Merging in conpot geoloc and user-management changes