Changes:
- CreateTemplate and RegisterTemplate now support adding a template tag. It is a string value. This is root-admin only action - only admin can add template tags.
- ListTemplates will return the template tag in response.
- HostAllocator changed to use template tag along with the existing tag on service offering. If both tags are present, allocator now finds hosts satisfying both tags. If no hosts have both tags, allocation will fail.
- DB changes to add new column to vm_template table.
- DB upgrade changes for upgrade from 2.2.10 to 2.2.11
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/template/TemplateAdapterBase.java
server/src/com/cloud/vm/UserVmManagerImpl.java
089b23f7a6