Added retry and timeout capability to the directory connection and added missing Javadoc
Added additional verifications and assertions
Merge remote-tracking branch 'origin/master'