Merge "Revert "Fixing apache stuck for ceilometer on dedicated node.""