using common locators for env and ak
Merge pull request #390 from sghai/fix-common-loc

using common locators for env and ak