Fix broker.storage_policy_index after .set_storage_policy_index

Change-Id: I5abd232263ef4443d7f63ae9995a6a996eeca8c7
Merge "Fix broker.storage_policy_index after .set_storage_policy_index" into feature/ec