ReAdd validation for wbsetreference....

The call to the method was accidently removed,
this re adds it as well as doing general cleanup

Bug: 56623
Bug: 56662
Change-Id: I8b8f8930fc47a530165fc51caaf52ccb9efa1495
Merge "ReAdd validation for wbsetreference...."