Actually use port if its an option
Resolve code review comments

suggestion by @portertech for code quality
Fix port auto-boxing to force to integer
Fix inconsistent naming
Cleanup disable options

As suggested by @portertech
Merge branch 'es-heap-version-fix' into deploy
Merge branch 'es-metrics-version-fix' into deploy