Merge "Update status-context to append java-version"