Fixed syncronization issue over DriverPolicyManager
Cleaning master branch
Merging context-refactor branch
Clean up master repo
Merge branch 'master' into context-refactor