ignoring the shepherd_data_dir used in unit testing
Merge remote-tracking branch 'origin/3.x' into 3.x