Merge "sensu: fix upgrade case when service is added" into stable/ocata