Malual merge of nightly changes from 2.5.  Accepted OBJ_ID conflicts from 2.5 branch.

git-svn-id: https://svn.kuali.org/repos/rice/trunk@48906 7a7aa7f6-c479-11dc-97e2-85a2497f191d
Merging nightly changes from rice-2.5 into trunk

git-svn-id: https://svn.kuali.org/repos/rice/trunk@48915 7a7aa7f6-c479-11dc-97e2-85a2497f191d
Merging nightly changes from rice-2.5 into trunk

git-svn-id: https://svn.kuali.org/repos/rice/trunk@48927 7a7aa7f6-c479-11dc-97e2-85a2497f191d
Merging nightly changes from rice-2.5 into trunk

git-svn-id: https://svn.kuali.org/repos/rice/trunk@48954 7a7aa7f6-c479-11dc-97e2-85a2497f191d
Merging nightly changes from rice-2.5 into trunk

git-svn-id: https://svn.kuali.org/repos/rice/trunk@48991 7a7aa7f6-c479-11dc-97e2-85a2497f191d
updating pom version and scm info
added missing .
Update pom.xml
Update pom.xml
Update pom.xml
update browsable url
Update pom.xml
Update pom.xml
Merge branch 'master' of github.com:ricepanda/rice