revert changes to allow multiple identifiers with same identifier types TRUNK-4293
added warning for short patient form and patient form
Merge pull request #1071 from harsha89/TRUNK-4293-additional

revert changes to allow multiple identifiers with same identifier types TRUNK-4293