Replicated changes made in blue branch in august: floating caption blocks, admin avatars and portwise plugin setting ldap flag