Merge "Fix meta/salt when heka_alarming is not present"