Merge "Correct cleanup when compacting metrics attributes" into oc-mr1-dev

    // clean attributes

    // contents of the attributes

    for (size_t i = 0 ; i < mPropSize; i++ ) {

    for (size_t i = 0 ; i < mPropCount; i++ ) {

        clearProp(&mProps[i]);

    }

    // the attribute records themselves

        clearProp(prop);

        if (i != mPropCount-1) {

            // in the middle, bring last one down to fill gap

            mProps[i] = mProps[mPropCount-1];

            copyProp(prop, &mProps[mPropCount-1]);

            clearProp(&mProps[mPropCount-1]);

        }

        mPropCount--;

        return true;