refactor NotNull and Nullable to be a private annotation.  This is to avoid IntelliJ code generation which does do what we want.
Merge branch 'master' into HFT-CHRONX-5