Feature #1697: Initial commit for user supplied Attributes on one.template.instantiate
Feature #1697: Add the new template instantiate param to ruby oca and cli
Feature #1697: Change Template::merge to replace and add attributes

This allows to merge a template with repeated attributes, like
several DISK or NIC atts.
Feature #1697: Add VM creation options to onetemplate instantiate (--cpu, --memory...)
Feature #1697: Add new template instantiate argument to java oca
feature #1697: Added CREATE perms for instantiate. Group user template code.
Feature #1697: Change the PoolObjectAuth used for the CREATE TEMPLATE
Merge remote-tracking branch 'origin/feature-1697'
Feature #1697: Use add_create_auth for the merged template
feature #1761: make xen monitor work with the driver name changes
feature #1640: add --cache option to onevm attachdisk
Feature #1739: Fix bug in VM monitoring parser
feature #1701: add io parameter to disks in kvm driver
feature #1701: add new disk io paramaeter to configuration file help
feature #1701: Default cache mode set to none
Merge branch 'feature-1701'
Merge remote-tracking branch 'remotes/opennebula/master'