SLING-4117 'mountByFS=true' doesn't work a second time (patch supplied by Sandro Boehme)

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1637252 13f79535-47bb-0310-9956-ffa450edef68
cosmetic code cleanup - remove some unused imports and a unused variable

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1637253 13f79535-47bb-0310-9956-ffa450edef68