fix the common upgrade
fix the common upgrade

Closes-Bug: #1623305
Change-Id: I21ca191cb5a45b0beb97dfe67a209999b9033cb0
Signed-off-by: Jeffrey Zhang <b85963bd7b7bde6f22347263e92cb006603c0858@gmail.com>
(cherry picked from commit bd08f5598912cd1479f20ab5a54762b8406b3e75)

negronjl/kolla,negronjl/kolla,negronjl/kolla