Remove NewClaim dependancy on Lib

This change remove the guidgenerator dependancy and
switches the logic used in newClaim with that which
was previously in newClaimBase.

REQUIRES: Ibd4a56196af8 & I6fd508aa3941b3a in WB

Change-Id: Ibfae2f3de188430186ec59692595df061764401b
Merge "Remove NewClaim dependancy on Lib"