Merge hotfix bug fixes into develop

This is a manual transfer of

I4055ecb44aa21af3e9294283f1f4984e068e2fed
(Fix a bug in CollectionRelationAlreadyExists)

and part of

Ic2bcb4d1e25650b1399e8f8ff4d019cebd12d325
(Fix a bug in fluffing up ref sequences)

from hotfix/mergeVariousLiftSRFixes to develop.

This is a kludge to get critically needed fixes into develop before
the GIAL class starts tomorrow. It does not include the parts of the
second patch that have to do with adding unit tests. I'm making a minimal
change because Neil and Eberhard are unavailable and we don't have a
process any of us here know about for this kind of patch.

Change-Id: I900f07568a804771bec88a7c219c3641bf9bb3ec