Combine various history actions

Resubmit b/c of buggy tests

Change-Id: I98bb9d96a7c61200c0d43f8ed4d32432b72fb70d
Add BC for obsolete action names

Change-Id: Ib21eb97d8c3448059eae0ca8314a211b9d240419