Update src to use 2.5.4-2 as the baseline
Release mer-2.5.4-2