[NUCJPA-287] Cleanup <map-key-column> processing to relate to correct
parent object. Also improve @MapKeyColumn handler to not duplicate
column info