bug #4603 Field disabled when internal relations used

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Merge branch 'QA_4_2' into QA_4_3

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>