This merge request is to specifically address the issue of making sure that the cardinality of NetworkInterfaceRequirements is 1. Added max-elements "1" for that.
Since the master branch had other merges that broke it, this commit also has changes to address them.