Issue #1773832 by goldorak, dawehner, fastangel, tim.plunkett: Fixed Replace usage of drupal_attributes(), refactor to use Attribute better.