merge from alibaba/druid

merge from alibaba/druid