Merge fix for 14743364 from trunk

- Fix resolving of actual simple ref type.

Change-Id: I3e6eb7f5166bd75903250de857154530603d931e
Increase release version

- 2.1.15

Change-Id: I1cb91c0b0f8a083db3a2a2cee99507c6d6e816d7