Adding MockUserArgumentResolver configuration, fixing bb-rest build, breaking some functionality