Merge "Extra GC heap configuration parameters." into jb-mr1-dev