Added current version capturing to Activity creation and update PLFM-1745
Merge pull request #315 from dburdick/develop

Added current version capturing to Activity creation and update PLFM-174...
Merge pull request #316 from eric-wu/develop

Java client and integration tests for trash can
Correct a typo (forgot to commit this)
Refresh from origin develop