merged release conflict
merged release conflict

kairosdb/kairosdb,at15/kairosdb-1,ppbizapps/kairosdb,rdettai/kairosdb,rdettai/kairosdb,ppbizapps/kairosdb,ppbizapps/kairosdb,KCFTech/kairosdb,KCFTech/kairosdb,KCFTech/kairosdb,at15/kairosdb-1,kairosdb/kairosdb,rdettai/kairosdb,KCFTech/kairosdb,kairosdb/kairosdb,ppbizapps/kairosdb,kairosdb/kairosdb,at15/kairosdb-1,kairosdb/kairosdb,at15/kairosdb-1,at15/kairosdb-1,KCFTech/kairosdb,rdettai/kairosdb,ppbizapps/kairosdb,kairosdb/kairosdb,rdettai/kairosdb