Eradicate last of underscores in options

The --ip_range in stack.sh remains due to nova-manage needing to be fixed.

Change-Id: Ic0f93d41b6edfdc5deb82ae820e2c0c5a8bce24e
Merge branch 'ldap-ad' into dt-test
Merge branch 'screen-stop' into dt-test