Revert topic 'bundle-updates'

It changes the signature of gp_file_type and breaks the Qt4Deploy test.
Merge topic 'bundle-updates' into next

6197dfa8 Revert topic 'bundle-updates'