[code-reflection] Integrated: Fixed merge issues from last PR

[Gary Frost]

I messed up the previous merge.. 

This PR has fixes

-------------

Commit messages:
 - Fixed merge issues from last PR

Changes: https://git.openjdk.org/babylon/pull/613/files
  Webrev: https://webrevs.openjdk.org/?repo=babylon&pr=613&range=00
  Stats: 12 lines in 3 files changed: 2 ins; 5 del; 5 mod
  Patch: https://git.openjdk.org/babylon/pull/613.diff
  Fetch: git fetch https://git.openjdk.org/babylon.git pull/613/head:pull/613

PR: https://git.openjdk.org/babylon/pull/613