BUG 2245 - Fixed Avoid cycle between Java package (TypeToClassKey only)

Change-Id: I4496cd238824b1b1430805775e30665a7c199c11
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>