Merge "added param for AVI_LBAAS_PANEL_NAME, removed API_MASK_PROTOCOL duplicity"