Issue #1125356 by johnnyfive,ipwa: Fixing a bunch of Drupal 7 errors and fixing assigning blocks to sidebars