[occi-wg] The latest occi document checkin was not merged, other changes were discarded.

Hi, The document check in has not been merged with other changes, effectively discarding them. PLEASE MERGE THE FILE BEFORE CHECKING A FILE IN !! -gary