Added QueryCounter helper class for specs.
Snapshot creation disabled for Templates

Implemented the supports_snapshots? method

https://bugzilla.redhat.com/show_bug.cgi?id=1005285
Add modeling for template many-to-many tenant

In OpenStack, an image (TemplateOpenstack) can exist in more than one project
(CloudTenantOpenstack).  These migration and model changes allow an OpenStack
template to list the tenants it can be used in, and allows a Cloud Tenant to
list the templates associated with it.

The table is named "cloud_tenants_vms" to reflect the physical tables used in
for the join.

Despite the table name referring to the generic objects, the relationship is
purposefully restricted to Openstack templates and Openstack cloud tenants in
the association defined in the models.  This keeps the notion of the
many-to-many relationship restricted to the most specific level.

The relationship methods are named:

* TemplateOpenstack#cloud_tenants
* CloudTenantOpenstack#opentack_templates

Additionally, to facilitate keeping the relationship as specific as possible,
CloudTenant is now sublassed to CloudTenantOpenstack.  Since all of the existing
cloud tenants are only openstack tenants, the migration initializes all of the
CloudTenant records to have a type of CloudTenantOpenstack.
Treat date "from"/operator filters as dates, not times

Without this, the existing tests fail when run on a system that's east
of Greenwich.
Reset flash_array when viewing screen off off vm summary screen.

Reset flash_array so flash message is not displayed when clicking on links such as Snapshots/Genealogy/Container/Operating System etc from summary screen after perfomring some actions like "Edit Tags".

https://bugzilla.redhat.com/show_bug.cgi?id=1146249
https://bugzilla.redhat.com/show_bug.cgi?id=1102658
Convert schedule_form partials to haml
Add support for Openstack SSL

Allow connections to Openstack to use SSL.

https://bugzilla.redhat.com/show_bug.cgi?id=1089727
https://bugzilla.redhat.com/show_bug.cgi?id=1140693
Smarthost templates removed from host view

https://github.com/ManageIQ/manageiq/pull/710#issuecomment-56865714
Allow default zone description to be changed

Removed the section of code that was blocking the default zone description
from being changed. Displayed the zone description when add/edit a ems.

https://bugzilla.redhat.com/show_bug.cgi?id=1098305
Kerberos SSO Update

When going back from SSO to database mode, SSO was still
being attempted. Code was looking at the wrong configuration
variable for authentication mode.
Merge hidden_span_if and hidden_div_if

Can now use hidden_tag_if for good and evil
Fixed 'Hourly' charts for VMs that are grouped using tags

Previously, the hourly charts always showed 'None' as in no records
found when the 'Group by' option was selected to retrieve VMs
associated with a particular tag, even though the records did exist.
This was due to the fact that the model name for 'association_type'
that was used to retrieve the records was 'Vm' instead of 'VmOrTemplate'

https://bugzilla.redhat.com/show_bug.cgi?id=1009951
Add logging for Cruise Control Builds before preparing the database

[skip ci]
Merge pull request #731 from AparnaKarve/bz1009951_fix_hourly_graphs_when_data_is_grouped_by_tags

Fixed 'Hourly' charts for VMs that are grouped using tags
Merge pull request #704 from h-kataria/reset_flash_array_when_viewing_screens_off_of_summary_screens

Reset flash_array when viewing screen off off vm summary screen.
Fix database diagnostics tab

This is to fix the following two problems:
1. Traceback when accessing the diagnostics -> database tab:

Error caught: [NoMethodError] undefined method `display_name' for nil:NilClass
vmdb/app/views/layouts/_edit_log_depot_settings.html.erb:17

2. DB depot selection not working. This was caused by @prev_uri_prefix
being erroneously overwritten by log_depot_get_form_vars() method.

https://bugzilla.redhat.com/show_bug.cgi?id=1145800
Reset value of index if chart is not available.

- Added line of code to reset value of index in @perf_options to fix an issue([] for nil:NilClass error), if user has zoomed in on one of the charts and then changed options such as group by from the options box on the screen and the returning result didn't include the chart user was zoomed in on. With this change user will be presented with all the zoomed out available charts.
- Moved setting of chart_layout variable outside of the if block as perf_gen_chart_layout method might set @perf_options[:index] to nil in case the zoomed in chart is not present for selected options on screen.

https://bugzilla.redhat.com/show_bug.cgi?id=1144622
https://bugzilla.redhat.com/show_bug.cgi?id=1145741
Merge pull request #680 from h-kataria/fix_nil_error_when_changing_group_after_zooming_chart_in

Reset value of index if chart is not available.
Merge pull request #717 from eclarizio/convert_schedule_form_erb_to_haml

Convert schedule_form partials to haml
backport truncate until we've upgraded.

truncate was added in upstream in
9a4e183fe9f81365f7815c391512b3d46622d8c8