[NOJIRA] Fixes for recent pulls

@jonmhays: The drive icons need to go into the subfolder drive_icons.
@ctweney: Fixed the minor test failure with my_activities_spec noise since i was doing cleanup.