Signed-off-by: Eli Uriegas <eli.uriegas@docker.com> (cherry picked from commit a1b7f6f3407546ff41ed2e0d16d7e1b2a8ac0ef4) Conflicts: components/packaging/static/Makefile Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com> (cherry picked from commit a1b7f6f3407546ff41ed2e0d16d7e1b2a8ac0ef4) Conflicts: components/packaging/static/Makefile Signed-off-by: Andrew Hsu <andrewhsu@docker.com>