Merge "fix target location for ceilometermiddleware data"