Do not overwrite options.disco parameter if already set 
Do not overwrite options.disco parameter if already set 

git-svn-id: a243b28a2a52d65555a829a95c8c333076d39ae1@2797 44740490-163a-0410-bde0-09ae8108e29a

shoaibali/simplesamlphp,jschlyter/simplesamlphp,simplesamlphp/simplesamlphp,gtkrug/simplesamlphp,dnmvisser/simplesamlphp,StudentLifeMarketingAndDesign/simplesamlphp,simplesamlphp/simplesamlphp,sitya/simplesamlphp,gtkrug/simplesamlphp,grnet/simplesamlphp,maytechnet/simplesamlphp,cwaldbieser/simplesamlphp,girgen/simplesamlphp,dzuelke/simplesamlphp,grnet/simplesamlphp,dnmvisser/simplesamlphp,madmatt/simplesamlphp,StudentLifeMarketingAndDesign/simplesamlphp,Kunstmaan/simplesamlphp,Kunstmaan/simplesamlphp,StudentLifeMarketingAndDesign/simplesamlphp,sitya/simplesamlphp,Kunstmaan/simplesamlphp,Kunstmaan/simplesamlphp,sitya/simplesamlphp,dialogik/simplesamlphp,dzuelke/simplesamlphp,BrettMerrick/simplesamlphp,girgen/simplesamlphp,jschlyter/simplesamlphp,dzuelke/simplesamlphp,shoaibali/simplesamlphp,ghalse/simplesamlphp,jschlyter/simplesamlphp,ghalse/simplesamlphp,ghalse/simplesamlphp,girgen/simplesamlphp,sylvainmed/simplesamlphp,sylvainmed/simplesamlphp,BrettMerrick/simplesamlphp,grnet/simplesamlphp,dialogik/simplesamlphp,maytechnet/simplesamlphp,madmatt/simplesamlphp,ghalse/simplesamlphp,maytechnet/simplesamlphp,cwaldbieser/simplesamlphp,dialogik/simplesamlphp,jschlyter/simplesamlphp,jschlyter/simplesamlphp,grnet/simplesamlphp,sitya/simplesamlphp,dzuelke/simplesamlphp,dnmvisser/simplesamlphp,simplesamlphp/simplesamlphp,shoaibali/simplesamlphp,shoaibali/simplesamlphp,sylvainmed/simplesamlphp,BrettMerrick/simplesamlphp,dnmvisser/simplesamlphp,dialogik/simplesamlphp,sylvainmed/simplesamlphp,cwaldbieser/simplesamlphp,dialogik/simplesamlphp,maytechnet/simplesamlphp,StudentLifeMarketingAndDesign/simplesamlphp,gtkrug/simplesamlphp,madmatt/simplesamlphp,simplesamlphp/simplesamlphp,girgen/simplesamlphp,cwaldbieser/simplesamlphp,gtkrug/simplesamlphp,girgen/simplesamlphp,madmatt/simplesamlphp,BrettMerrick/simplesamlphp