Updates to Tool Configuration extraction

no longer merges the drupal form fields with the tool configuration
full tool configuration is now pulled from the tool