* Resynchronize with stable/kilo (536dc83) (LP: #1481008): - [9ca4a53] Use action in check_*_complete method - [ed52c86] Produce more meaningful exception messages in nested stacks - [e35450a] Fix failures related to the mock 1.1.0 release - [ac5e71f] test_resource for functional tests - [c0d1b91] Improve StackValidationFailed response in properties - [99f95f0] Count all nested stack resources with DB operations - [5703a2f] Add domain when list users in heat-keystone-setup-domain - [18742d1] Heat could not create samples with Ceilometer - [a55f827] Missing template file on update fails silently - [1b5ff07] Failed to import test module in test - [b0be013] Add env storing for loaded environments - [a3bc0f6] Fix heat-db-setup error on rhel7.1 - [3a7e7cb] Find root stack ID with database operations - [38b47eb] Continue to check if nova task is in progress - [8919a34] Catch exceptions in service status report - [754851d] Fix block_device_mapping property validation when using get_attr - [28a0639] Do not verify requirements on extension loading - [7148a96] Backup new resource as soon as possible - [da37773] Save updated-in-place resources to backup stack - [be9af28] Report status when engine start - [d2e70e4] Use snapshot's environment when stack restore - [612d806] Fix integration tests for tox>2.0 - [ed2bed2] Fix property validation for TemplateResource during update - [a5297fe] Get rid of circular references in Resource and Function - [c7b1524] Sync oslo incubator - [06a5c0e] Generate stack events for stack state transitions - [aa4b90d] Update template paths for environment-mapped TemplateResources - [2a6378c] Fix TypeError exception during cancel stack update - [536dc83] Use SHA256 instead of SHA1 for resource signature * d/p/fix-requirements.patch: Rebased.