bz 1116750
fix the description of command "aliases"
Merge pull request #5917 from sztsian/master

Merged by openshift-bot
make the default crt/key/chain file to be configurable in vhost template
for custom certs; chain file is the same as ssl file
Merge pull request #5921 from rajatchopra/master

Merged by openshift-bot