1fd625d650
* Update template and packaging code for fleet packages
* Fix linting
(cherry picked from commit 61e5b44c44)