Deprecate SCREEN_LOGDILR for LOGDIR

Change-Id: I3ac796e322a18dbd0b8b2310a08310ca159d7613
Merge branch 'nonovnc' into dt-test
Merge branch 'identity-v3-default' into dt-test
Merge branch 'screen-logdir-again' into dt-test
Merge branch 'conf-tempest' into dt-test
Merge branch 'test-service-functions' into dt-test
Merge branch 'exercise-refresh' into dt-test