Fix bundle-image incompatibility with lxml 2.2
Speed up euca-bundle-image a little bit