Revert "Revert "CONN-732:Fix Assertion id if incoming one does not prepend with _""

This reverts commit 89360dc2d2790929822712f18b00df9d7dc9c1f0.
Revert "Revert "CONN-746""

This reverts commit ac06114120ca5592511405cf96419a17c8e3e591.