Merge "Fix exception when trying to update config of detached stack" into nyc-dev
am: a1984286d3

* commit 'a1984286d397e4198d4e26572fb54cd55dce6d20':
  Fix exception when trying to update config of detached stack

Change-Id: Id7fca21dc2a23206e2b241f90ac1119cf5281e18