Merge pull request #808 from ochameau/793925-3rd-party-packages

Bug 793925 - Fix support of 3rd party packages. r=@gozala(cherry picked from commit d6a76a2896c590beff686a44bafaeda6f69f9e89)