Bug 998 - fix for update flow

Change-Id: Iad157785a9f42e89d6b99d4211fdce591efcea41
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>