Fixed hadoop keys generation in case of existing extra

Also added extra value to test.

Change-Id: I1b76e20254445bf653a9c6d5e62019a95bef1ffb
Merge "Fixed hadoop keys generation in case of existing extra"