Merge "Fix spring transaction issue in getNodetemplates"