(RequireUtil) Fix require ording; pull oae-rest from master