Merge pull request #1264 from jay-hodgson/release-64

SWC-1828: merge fix to release-64
SWC-1831: set version to 1L when submitting non-versionable entities to an evaluation.  Also fix gwt rpc for submission
Merge pull request #1265 from jay-hodgson/SWC-1831

SWC-1831: set version to 1L when submitting non-versionable entities to ...
null message listener