Merge "End support for changing cinder periodic_interval"