WTP 3.4.2 Patches

Bug 417120. [hotbug][regression]JPT Catalog layer should be optional