Bug 421670 - Add Cross and Circle annotation types to XYGraph

Change-Id: I01b024ef3c9c8df4e25dc76baa3c05147c6ca69b
Signed-off-by: Torkild U. Resheim <torkildr@gmail.com>
Temporarily disable bundles with broken tests.