Issue #277 - Changes type from Integer to Long

* The default auto id policy in the Datastore could generate a
  16 digit long number, which triggers a NumberFormatException
  when trying to convert a String to Number
Merge branch 'hotfix-1.5.1.2'