One more "Any Server" fix.

Also changed some methods that returned LinkedList to List
This var is not needed any more.

Quick fix for working as before with templates plugin
Fix JENKINS-21067 by jumping hoops