upgraded to 2013.07 and bug fixes

terminate drive should wait until op either passes or fails before
returning
if server in running state, stop it before attempting changes
updated supported ruleTargetTypes to CIDR only
throw OperationNotSupportedExceptions if ruleTargetType not supported