Merge pull request #2199 from jaroug/support_attributes_kairosdb