Merge "Fix Heka meta to support alternative log location"