Update Juju bundle to use the latest merged charms
Update Juju bundle to use the latest merged charms

neiljerram/felix,TrimBiggs/calico,matthewdupre/felix,TrimBiggs/calico,neiljerram/felix,Metaswitch/calico,matthewdupre/felix,neiljerram/felix,Metaswitch/calico,neiljerram/felix