Shade fixes

Revert removal of metastore code removal until painkiller is integrated
Remove shade exclusion on Apache commons lang