SEBA-432
SEBA-565
SEBA-654 (alarms)

implemented

fix Jenkins make errors
fix merge conflicts
address review comments

Change-Id: Ia2e95afb33ce55054afa1fcbd9beb6ada62dd764
diff --git a/.gitignore b/.gitignore
index 203f81b..32fcb27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
-bbsim
+api/swagger/bbsim.swagger.json
+/bbsim
 protos/openolt.pb.go
 coverage.txt