Bug-1809: Fix GracefulCapabilityHandler.

Change-Id: I2ce874d2558595db0ec0e09b530b703b8d59c13d
Signed-off-by: Milos Fabian <milfabia@cisco.com>
Merge "Bug-1809: Fix GracefulCapabilityHandler."