Change default upgrade version to 6.0

Change-Id: Ifbd28eae7e25bcc80a35b17360ac3a59642f3011
Closes-Bug: #1376710
Merge "Change default upgrade version to 6.0"