Merge "OPNFLWPLUG-929 : Remove deprecated guava library"