Merge tag '1.0.0-beta.3' into develop

1.0.0-beta.3
Move to more Java 8 idioms like Optional.of(T)
Encode password flag should set back to false once encoded
Fix the use of Java 8 optional
Bump version
Merge branch 'release/1.0.0-beta.4'