Don't create indexes on fields mapped with @NotSaved or @Transient either
checkstyle fixes
checkstyle fixes
Merge remote-tracking branch 'upstream/master'