Merge branch 'upstream' into integration
bump
Merge branch 'allowed_user_hosts' into integration

Conflicts:
	metadata.rb
bump
Merge branch 'allowed_user_hosts' into integration
bump
Merge branch 'allowed_user_hosts' into integration
Merge branch 'upstream' into integration
Merge branch 'template_variables' into integration
bump
Merge branch 'template_variables' into integration
bump
bump just in case i did something that i forget
Merge branch 'cleanup_lwrps' into integration
Merge branch 'expand_graph_lwrp' into integration

Conflicts:
	resources/graph.rb
Merge branch 'upstream' into integration
Merge branch 'trigger_dependencies' into integration
Merge branch 'trigger_dependencies' into integration
Mergk branch 'trigger_dependencies' into integration
Merge branch 'trigger_dependencies' into integration