Fixed boolean/wsadmin converter
Merge branch 'master' into performance_optimizations