Merge "Removed the unused netconf config files (which are auto-populated using maven...