Bump master branch to 6.0

Change-Id: Ic1156d9dc5ca2ee86d1b4e2de953cc46748b9dfd