set runtime:server as default when booting app
updates basing on review feedback
Merge remote-tracking branch 'upstream/develop' into runtime
add fix to history entry
minor format change
Merge pull request #1196 from lzhan/runtime

set runtime:server as default when booting app