[SD-828] Fixing the nosetests and behave tests when AD is active. Because of role changes these tests were failing.
[SD-828] Modified travis configuration to run behave tests for AD also.
Merge remote-tracking branch 'upstream/master'