Devel

Resolving ticket CSCLOUD-59 ("Add merging with local configuration for glidein bootstrap
").
I think we can write e-mail to Tony.