old_contents: def opts():
    '''
    Return the minion configuration settings
    '''
    if __opts__.get('grain_opts', False) or __pillar__.get('grain_opts', False):
      return __opts__
    return {}
  
new_contents: '''
  Simple grain to merge the opts into the grains directly if the grain_opts
  configuration value is set
  '''
  
  def opts():
      '''
      Return the minion configuration settings
      '''
      if __opts__.get('grain_opts', False) or __pillar__.get('grain_opts', False):
          return __opts__
      return {}
  
subject: Clean up spacing