Merge branch 'master' into vint_dev
add todo: RMI Server address should support configuration.
Merge branch 'vint_dev'