Integration 2021 wk24
MR !1179 (merged) : Fix Incorrect Array Size computation
MR !1182 (merged) : CI NSA test fixes and enhancements
MR !1169 (merged) : Dataplane bug in L2NFAPI_NOS1
MR !1179 (merged) : Fix Incorrect Array Size computation
MR !1182 (merged) : CI NSA test fixes and enhancements
MR !1169 (merged) : Dataplane bug in L2NFAPI_NOS1