Merge pull request #294 from sivakuna-aap/master

SD-717 Modified behave tests to work when AD is active