Merge "Bug-730: Add GracefulCapabilityHandler test."