Increase timeout waiting upgrade is done

Change-Id: I9eb0217d1614ae541d1549b4073f5d90095595a0
Closes-Bug: #1349481
Merge "Increase timeout waiting upgrade is done" into stable/5.0