Avoid discarding alarm-threshold-create --query option

Fixes bug 1271913

The query is crucial to the alarm evaluator statistics query
being well-formed, so must not be discarded.

Change-Id: I5ff8dcb420b932fc58dfef3dadfcbc4a4dc5cf66
Merge "Avoid discarding alarm-threshold-create --query option"