Finish windfarmscadapower#196

paulf81 wants to merge 11 commits intoNREL:developNREL/hercules:developfrom

paulf81:feature/windfarmscadapowerpaulf81/hercules:feature/windfarmscadapowerCopy head branch name to clipboard