FGCP: added better checks to ensure node is in expected
state before/after performing operation
FGCP: tune timeouts