Re-factored to use rally_api instead of adhoc; tested through export stage
Merge