Remove configuration parameter EXTRA_OPTS

According to the comments in stack.sh the configuration parameter
EXTRA_OPTS should be removed during the Juno cycle.

Change-Id: Ic71d38d6f9b8a8949e45ce3321d593ee2f8feb40
Remove configuration parameter Q_DHCP_EXTRA_DEFAULT_OPTS

According to the comments in stack.sh the configuration parameter
Q_DHCP_EXTRA_DEFAULT_OPTS should be removed during the Juno cycle.

Change-Id: I3b38ff57f00e93e6d9692f516291f7129584bc74
Merge "Remove configuration parameter EXTRA_OPTS"
Merge "Remove configuration parameter Q_DHCP_EXTRA_DEFAULT_OPTS"
Merge branch 'local-vars' into dt-test
Merge branch 'local-vars-cinder' into dt-test
Merge branch 'local-vars-heat' into dt-test
Merge branch 'local-vars-ironic' into dt-test
Merge branch 'local-vars-accounts' into dt-test
Merge branch 'local-vars-backends' into dt-test
Merge branch 'local-vars-horizon' into dt-test
Merge branch 'local-vars-keystone' into dt-test