Hk2 2.1.54 -> 2.1.59

Change-Id: I4868b8e9b07561ef260fa90df2cc3c7fe8417ab0