Update the included platform files

This commit was SVN r27979.

contrib/Makefile.am

@@ -44,10 +44,12 @@ EXTRA_DIST = \
         platform/ornl/ornl_configure_self_contained \
         platform/lanl/macosx-dynamic \
         platform/lanl/macosx-dynamic.conf \
-        platform/lanl/cray_xe6/debug-nopanasas \
-        platform/lanl/cray_xe6/debug-nopanasas.conf \
-        platform/lanl/cray_xe6/optimized-nopanasas \
-        platform/lanl/cray_xe6/optimized-nopanasas.conf \
+        platform/lanl/cray_xe6/debug-common \
+        platform/lanl/cray_xe6/debug-lustre \
+        platform/lanl/cray_xe6/debug-lustre.conf \
+        platform/lanl/cray_xe6/optimized-common \
+        platform/lanl/cray_xe6/optimized-lustre \
+        platform/lanl/cray_xe6/optimized-lustre.conf \
         platform/lanl/rr-class/cross-debug-slave \
         platform/lanl/rr-class/cross-debug-slave.conf \
         platform/lanl/rr-class/cross-optimized-slave \