Merge "FlowNAC updated descriptors (plugtest): Fixed Makefile"