ctl upgrade fixes

Change-Id: I0f25adcd214a03c6659db2f94e6c03e601eff30f
1 file changed