Add variable to include additional templates to merge

This patch adds a variable to allow for additional template paths
to be passed to the merge.py call.
Removing UI patch that has been merged

Removing patch for adding parameters page, it has been merged.
Merge pull request #30 from Ladas/master

Removing UI patch that has been merged
Update $LKG
Cherry-pick the block & object storage t-h-t patch
Merge pull request #31 from tomassedovic/patch-2

Cherry-pick the block & object storage t-h-t patch
Merge pull request #29 from gfidente/master

Remove cinder-volume from image elements, add cinder-volume-nfs instead
Fix incorrect reference to nfs-utils element when it is named nfs-client