revert changes to allow multiple identifiers with same identifier types TRUNK-4293
(cherry picked from commit 7924ae0b4e9f693e5877e12fce02b854c478c91d)
added warning for short patient form and patient form
(cherry picked from commit 33b173009f2b55679db3f08974b2891b9a4a7c5c)