Solaris requirements: combine previous code with autolibs update. Refs #1774