backport bug fixes

do not return from delete volume method until op has either passed or
failed.
stop server before modify operations if it is running.
throw OperationNotSupportedException for RuleTargetType.GLOBAL