Sync oslo incubator

Synchronize with latest versions for used oslo incubator modules.

Change-Id: I165d95cd0845780cffce7a8adff221dd383b52b8
Deprecate preview --create-timeout in favor of --timeout

Replace the --create-timeout option with a more generic and intuitive
--timeout option. And remove the default value to rely on the
server-side default (which is 60mins anyway).

Change-Id: Ibd8651d7a938dada6c6952607987d4ab98f24550
Process provider templates for included files

Currently a provider template in the environment or template will not be processed
for other provider templates or calls to get_file.

This change calls get_template_contents from within get_file_contents if the
get_file_contents call is flagged as being for loading a template. This results in
recursive calls to get_file_contents for any combination of provider paths or get_file
calls.

This means many of the template_utils tests need to return valid template content
instead of less meaningful stubs when resolving resource provider paths.

Change-Id: I887b1238d7f7cd67719d54cbc702bbc982552db8
Closes-Bug: #1296950
Updated from global requirements

Change-Id: Idf94dbca9d65664715e64c049e6a8337be7d6c62
Merge "Sync oslo incubator"
Merge "Deprecate preview --create-timeout in favor of --timeout"