Fix for diff upgrade tarball

Implements: blueprint reduce-tarball-size
Change-Id: I0456a06d675e7e1a535669475a6216009be73430
Merge "Fix for diff upgrade tarball" into stable/5.0