Manual merge of "branch_v2plus_igor_2454_v2" into "master".

 * Shuffling the order in which the files are loaded by the glideins,
   so that we have a minimally working condorstartup script ASAP.
 * Split basic x509 checks and setup from proxy lifetime checking.
 * Allow for the creation of a minimally functional GSI setup that is good enough for condor_advertise,
   but not condor_startd.
 * The glidein will now try to advertise a Machine ClassAd to the VO collector
   to notify the VO there were validation problems.
 * Make advertising the error classad optional.
   The glidein now expects a parameter called
    GLIDEIN_Report_Failed
   with the following semantics:
    NEVER - Do not send a classad
    ALIVEONLY - Send the classad, and de-advertise when the glidein terminates
    ALWAYS - Send the classad, and leave it there in Killing activity on exit
Bug 3627: Remove old -r flag from condor_master invocation
Bug 3632: improve documentation for untar_options
Add checks for existence of {grid,voms}-proxy-info in path
Merge branch 'master_3627'
Fix link from truncated entry names
Merge remote-tracking branch 'origin/master_3632'
3673: Remove corrupt monitoring XML files
3673: Remove corrupt monitoring XML files
Explicitly define the glidein_startup PID
3673: Fix import typo
Remove extra format string in log statement
3684: Fix --source with http URIs

Moved the check for the existence of the monitor XML directory under
the if stanza for local filesystem
Merge branch 'master_3673'
Merge branch 'branch_v3plus_igor_2454_v2'

Conflicts solved:
	creation/web_base/setup_x509.sh
        Moved Burt's code into a new function, called check_x509_tools
Feature 3100: change name of secondary collector config file
Moved the actual template file
We still want 01_gwms_collectors.config. Properly split it into 01_gwms_collectors.config and 11_gwms_secondary_collectors.config, so that only secondary collector info goes into the latter.
Feature #3100 Dynamically creating the secondary collectors config file

Made the following changes based on discussions on the ticket:
1. Change it back to creating a 01_gwms_collectors config for the
   basic collector information.
2. Creates a stub 11_gwms_secondary_collectors config if no
   secondary collectors are specified on initial install.
3. Populates the 11_gwms_secondary_collectors config when
   additional secondary collectors are specfied on initial install.
4. Move the negotiator attributes into the 01_gwms_collectors config
   to align it more with the templates.
Add glidecondor_createSecCol, a tool to create the secondary collector config file