Merge pull request #883 from vietj/master

Improvements for codegen
kind of tried to enabled hazelcast tests but keep commented for now
Provide missing json constructor for options objects