Obs should have a pointer for the form_field it was created through - TRUNK-2069

Cleaned up the code - TRUNK-2069

Cleaned up the code - TRUNK-2069

Cleaned up the code - TRUNK-2069