Merge pull request #1 from osate/develop

Sync with upstream.
Merge remote-tracking branch 'upstream/develop' into develop
[AadlNavigatorSorter] Handles case when e1 and e2 are both the plugin
resources project. Fixes issue where the Plugin_Resource project appears
multiple time after creating a workspace.
Merge pull request #441 from philip-alldredge/develop

Fix for Plugin_Resources Appearing Multiple Times After Workspace Creation