Refresh aws cloudformation

This the second half from the slitting of PR #333. It is a sub PR of #523.

This PR collects templates and stacks and updates manageiq database. 

It depends on PR #899: add_orchestration_models. New changes are in the second commit as the first commit is for PR #899.
Minor, but no need for the parens anymore, since the second parameter was removed