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
Add a description of how stack-abandon works

The online help for stack-abandon does not make it clear that the stdout
will be a helpful blob of json, nor does it make clear what
stack-abandon will actually do.

Change-Id: I3822a87aba2b83261c0d0357a0b9024ce6f3a5b2
Updated from global requirements

Change-Id: Idf94dbca9d65664715e64c049e6a8337be7d6c62
Merge "Sync oslo incubator"
Use correct order of arguments to assertEqual

The correct order of arguments to assertEqual that is expected by
testtools is (expected, observed).

This patch fixes the inverted usage of arguments in some places
that have cropped up since the last fix of this bug.

Change-Id: Ifbc5da5cba0c8dcdf5b9c9eb6e6bfb1b1c2b49b0
Closes-Bug: #1259292
Merge "Deprecate preview --create-timeout in favor of --timeout"
Remove unused arguments for stack-preview command

--create-timeout/--timeout and --disable-rollback have no meaning in the
context of stack-preview, and actually are not used by Heat during
stack preview action, so remove them.

Change-Id: I1f991eaddf98b0e5c0c3f8b4aaa33947eba53664
Closes-Bug: #1297748
Merge "Use correct order of arguments to assertEqual"
Merge "Remove unused arguments for stack-preview command"
Merge "Add a description of how stack-abandon works"
Heat client does not support OS_CACERT option

This option is standard in OpenStack clients to pass in the
location of any extra CA certificate bundle needed to
negotiate an SSL connection with SSL-secured services.

Change-Id: If675b36bf6bbd1df216277129b147c32555de0d0
Closes-Bug: 1308087
Merge "Heat client does not support OS_CACERT option"
fixed typos found by RETF rules

rules are avaialble at https://en.wikipedia.org/wiki/Wikipedia:AutoWikiBrowser/Typos

Change-Id: If1f71f38b48a1b1a887ddc3b153e653995989cc3