Fixed merge failure
Fixed merge failure

KCFTech/kairosdb,ppbizapps/kairosdb,wangtuanjie/kairosdb,ppbizapps/kairosdb,wangtuanjie/kairosdb,lgscofield/kairosdb,at15/kairosdb-1,at15/kairosdb-1,at15/kairosdb-1,panqingcui/kairosdb-1,deejay1/kairosdb,rdettai/kairosdb,lgscofield/kairosdb,panqingcui/kairosdb-1,deejay1/kairosdb,george-aprozeanu/kairosdb,KCFTech/kairosdb,KCFTech/kairosdb,panqingcui/kairosdb-1,panqingcui/kairosdb-1,kairosdb/kairosdb,kairosdb/kairosdb,rdettai/kairosdb,KCFTech/kairosdb,wangtuanjie/kairosdb,wangtuanjie/kairosdb,lgscofield/kairosdb,at15/kairosdb-1,george-aprozeanu/kairosdb,rdettai/kairosdb,ppbizapps/kairosdb,pawellesniewski/kairosdb,ppbizapps/kairosdb,deejay1/kairosdb,kairosdb/kairosdb,lgscofield/kairosdb,kairosdb/kairosdb,deejay1/kairosdb,kairosdb/kairosdb,pawellesniewski/kairosdb,KCFTech/kairosdb,deejay1/kairosdb,pawellesniewski/kairosdb,pawellesniewski/kairosdb,pawellesniewski/kairosdb,rdettai/kairosdb,lgscofield/kairosdb,george-aprozeanu/kairosdb,rdettai/kairosdb,ppbizapps/kairosdb,george-aprozeanu/kairosdb,wangtuanjie/kairosdb,george-aprozeanu/kairosdb,at15/kairosdb-1,panqingcui/kairosdb-1,kairosdb/kairosdb