EDIT

merge cate-development2 branch with trunk

fixes #1365 and #1366

Allowed replace(T x, T y) to accept null for the second argument and globally replace x with null or remove x from collections

Altered ReferringObjectMetadataFactoryImpl to exclude bidirectional relationships where the replaced entity is the "owner" of the related entity (i.e. the relationship is mapped by @OneToMany & mappedBy != null) since those kind of relationships don't make sense in the context of a global replace method.

ReferringObjectMetadata now queries higher up the hierarchy of classes to obtain a reference to a property

Added public T replace(T x, T y) to ICdmEntityDao, implementation and tests

Removed lines setting the security context holder strategy to global

now updated is set and all tests are ok.

changed securtityContextHolderStrategy

Merging revisions 7377-7378,7390-7396,7400-7405,7412-7414,7442-7443,7448-7449,7453-7456 of http://dev.e-taxonomy.eu/svn/branches/cdmlib/2.2 into trunk - test in error, see #1274, #1275