Upgrade, prevent user to run upgrade several times at the same time

Change-Id: Id9541f39217c9f1b8a37b25cc3054ecada9b15b7
Closes-bug: #1343292
Merge "Upgrade, prevent user to run upgrade several times at the same time"