Merge "allow config/sdcardfs directory to be seen for ARC++" into pi-dev