Increase the 'all' timeout because slow tests are included

The default for tempest in .testr.conf is 500s. This was too short for
the heat slow tests so the time for that was increased to 1200. This
change is to a periodic job so if we need to it can be increased more
in the future.

Change-Id: If27ddef9865c54b997130c707382d2014d82e0a6
Add wait for async secgroup add to minimum basic scenario

Security group add actions are asynchronous so we can't assume that
the security will be available immediately to ssh into the server.
This commit fixes the issue by adding a wait for the secgroup to show
up in the server before we move on.

Fixes-bug: 1390355
Change-Id: Idd561d77ce2e4b83421bb7bfb6327a6c940b62ed
Merge "Increase the 'all' timeout because slow tests are included"