Merge pull request #450 from jimi1283/bugfixes

BUGFIX - globbed --boot-files are not copied properly
Merge remote branch 'upstream/bugfixes'
Fix cnames in the web GUI
Merge pull request #689 from tonykew/master

Fix cnames in the cobbler web gui