Refactor so we do assign and create unique id in separate calls

git-svn-id: https://svn.java.net/svn/mojarra~svn@13548 761efcf2-d34d-6b61-9145-99dcacc3edf1
Ignoring test while waiting for resolution

git-svn-id: https://svn.java.net/svn/mojarra~svn@13549 761efcf2-d34d-6b61-9145-99dcacc3edf1