Typos only
Hopefully changing the spelling of the error message doesn't break any clients
Merge pull request #685 from eric-wu/release-13

Fix data migration issues with DOI and TrashCan
PLFM-2177 Fix data migration order for DBOStorageQuota.
PLFM-2178 Enable CloudWatch metrics on TrashController.
PLFM-2032 Add Java docs for TrashController.
Merge pull request #688 from eric-wu/develop

PLFM-2177 Fix data migration order for DBOStorageQuota.
Merge pull request #689 from eric-wu/quickfix

PLFM-2178, PLFM-2032 Add Java docs and CloudWatch metrics to trash controller
Merge pull request #670 from kaysoky/NotSureWhyThisHasntBeenDoneYet

Fix some typos
Fix Hudson build failure.
Merge pull request #690 from eric-wu/quickfix

Fix Hudson build failure.
Merge branch 'release-13' into develop