Fix intermittent test failures.

Make bundles-containing and charm-related API
endpoints return results in a specific order.