Merge branch 'develop' into PLFM-2120
Merge pull request #644 from john-hill/PLFM-2120

Plfm 2120
Changes to exception handling
Merge pull request #636 from kaysoky/UserProfileStorage

User profile upgrade
Must fetch before update on E-tagged objects
Merge pull request #645 from kaysoky/QuickFix

Must fetch before update on E-tagged objects
removed unused models
Un disable caching in UserManager
Merge pull request #647 from kaysoky/ReenableCaching

Un disable caching in UserManager
Un disable caching in UserManager
removing unused constants
Merge pull request #649 from brucehoff/develop

removing unused constants
started collator
Refactor StringEncrypter
Reduce the size of the KEY field
Merge pull request #648 from xschildw/PLFM-2146

Un disable caching in UserManager
code review changes
merged in from upstream
Merge pull request #641 from dburdick/swc-648

Swc 648 - Java File uploader
update logging