Findbugs finding: Fix incorrect comparison, <VbdType>.equalsi(<String>) will always be false and should be <VbdType>.equals(<VbdType>)
Findbugs finding: the collections should have been made static
Findbugs finding: Fix object comparison with == instead of equals
Findbugs finding : Fix potential NPE