Simplified GoogleLinks, setting Velocity variable portalLinks in-place of the default setting, and returning neo/includeTabs.vm to its state before modification in SAK-22912-extended (v121462).


git-svn-id: https://source.sakaiproject.org/svn/portal/branches/SAK-22912-extended@122466 66ffb92e-73f9-0310-93c1-f5514f145a0a
Cleanup: removed unneeded changes, such as moving imports.

git-svn-id: https://source.sakaiproject.org/svn/portal/branches/SAK-22912-extended@122470 66ffb92e-73f9-0310-93c1-f5514f145a0a