Fixing GPON issue and consolidating xgsponBbsim and xgspon

Change-Id: Ifbd7e1c74a4a44cef4b19691494ade4575c6d941
diff --git a/VERSION b/VERSION
index 5c5bdc2..be706e8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.21
+3.1.22