Merge "Bump parent version to 2.5.4-SNAPSHOT"