Added tag jdk8u121-b04 for changeset a4f2db164131
Merge