Fixed clear configuration functionality.
Merge branch '7.x-1.x-dev' into 7.x-1.x
Merge remote-tracking branch 'origin/7.x-1.x' into 7.x-1.x