Fixes merge conflicts

Changes included by rails4_support branch and
changes included by isolate_engine branch