Add display name to all objects, this will allow for neutron to create >1 objects with same name
Generate default vm instance because it is needed to pass tempest
Revert "Generate default vm instance because it is needed to pass tempest"

This reverts commit f9363295dd982112d0415e1aec049c024da22898.
Add UT for kstate and UVE
If we receive xmpp-not-ready without receiving a vm-Unsubscibe, we do not
cleanup the xmpp-objects inside the ifmap-node. Fixing that.
For FlowSeries queries when granularity is specified, time-sample starts @ start_time + granularity. Therefore, if granularity > (end_time - start_time), then time-sample is > end_time and hence no result is being returned. Modified code to start the time-sample @ start_time instead of start_time + granularity.
Merge pull request #285 from naveen-n/master

* Thrift msg handler should return bool value, instead of InstanceServic...
Merge pull request #284 from Juniper/sundar_2345

Fix for #2345
memory leak fix
Merge pull request #283 from Juniper/tkarwa_script

If we receive xmpp-not-ready without receiving a vm-Unsubscibe, we do no...
Minor name change
Merge pull request #286 from Juniper/tkarwa_script

Minor name change
memory leak fix
Use monotonic_deadline_timer instead of deadline_timer.
Also, disable concurrency checks in ifmap_state_machine_test.
Merge branch 'master' of github.com:Juniper/contrail-controller into ut
launchpad bug id 1271740: Handle NoIdError for IP address allocation
Add nova config introspec tests and breakup test cases
Merge pull request #290 from Juniper/nova_cfg_test_code

Add nova config introspec tests and breakup test cases
Merge pull request #288 from Juniper/tkarwa_script

Use monotonic_deadline_timer instead of deadline_timer.
Merge pull request #289 from Juniper/sb

Sb