refactoring framework properties to support deep_merge and fixing tests
refactoring file auth to remove some params from the api
fixing bindDN in AD auth template
Merge branch 'master' into qa