This release fixes a regression in 3.6.0 that broke TripleO. Change-Id: If34deae6a6290be40f3d3b286b0af0d902716ce2