Fold history config into FlowActions

Change-Id: Ifa3646ffc6f45850ebe4c0292d3be34d01682d4d
Merge "Fold history config into FlowActions"