commit of verification long standing branch

Once you switch back to Apache commons collection 4.0, it would be ```unmodifiableMap```