Fix to handle null threshold_rule values

check if threshold_rule and combination_rule values
are None and raise the right error in the validation
method instead of propagating it further causing
unhandled exceptions.

fixes bug #1238453

Change-Id: I70a397c89d974e489fd0ccc4ab28d73aed51443f
Merge "Fix to handle null threshold_rule values"