Fixes #7041: fixed incorrect belongs_to mappings

:conditions reference columns from the local (to the relation) table,
while the condition is applied to the remote side of the association.
The condition can be removed, as it's redundant anyway.
refs #6161 - Add test to make sure override is marked on create
fixes #7336 - editing compute resource should not clear existing attributes from the form
Fixes #3848, #3309: Support deep merging of hash and array structures in smart class parameters

 Please enter the commit message for your changes. Lines starting