TIMOB-13220: Only allow wordwrap to exceed parent if wordwrap is disabled, and width is size behavior.
Merge pull request #4160 from ayeung/timob-13220-3_1_X

TIMOB-13220-3_1_X: Only allow wordwrap to exceed parent if wordwrap is disable...
[TIMOB-13583] Including ekentityType for pre iOS 6
Merge pull request #4168 from srahim/timob-13583-3_1_X

[TIMOB-13583] Including ekentityType for pre iOS 6
bump version to 3.1.1