Merge "BUG 309: Clarify the semantics of put{Configuration,Operational}Data()" into...