Merge "Remove 'local' from configure and configure.sh"