Template not required on stack-adopt

With this change, template is not required on stack-adopt and
also parameters from the original stack are adopted.

Change-Id: Id5a28400bb8e27a3b852f12d9af4c2dc7c144725
Closes-Bug: #1300336
(cherry picked from commit 8c54f483189fef2799357457c3b1e8bc0f9e87c5)
Merge "Template not required on stack-adopt" into proposed/juno