Upgrading to Shindig 2.5.0 from Shindig 2.5.0-beta6.

 Removing Shindig 2.5.0-beta6 specific workarounds.