merge from master to fix compile error
merge from master to fix compile error

CrazyJvm/reborn,fengshao0907/reborn,hart/reborn,qiuyesuifeng/reborn,fengshao0907/reborn,kangkot/reborn,ksmaheshkumar/reborn,kangkot/reborn,ksmaheshkumar/reborn,ksmaheshkumar/reborn,reborndb/reborn,CrazyJvm/reborn,qiuyesuifeng/reborn,is00hcw/reborn,CrazyJvm/reborn,fengshao0907/reborn,kangkot/reborn,reborndb/reborn,is00hcw/reborn,qiuyesuifeng/reborn,kangkot/reborn,reborndb/reborn,hart/reborn,reborndb/reborn,is00hcw/reborn,fengshao0907/reborn,ksmaheshkumar/reborn,hart/reborn,CrazyJvm/reborn,is00hcw/reborn,qiuyesuifeng/reborn,hart/reborn