Distinguish between default and legacy bitmaps
Merge pull request #841 from metamx/distinguish-legacy-vs-default-bitmap

Distinguish between default and legacy bitmaps