* Add Caliper v2.2.0 and v2.1.1 * Add conflict for adiak when for versions <2.2 * Trim trailing whitespace