bug #2253: sunstone vnc proxy can't find it's lock file correctly(cherry picked from commit 4d942f7a87934a9c462dd4d518b8d5de334c539d)
Bug #2253: Remove old VNC_LOCK constant(cherry picked from commit 5ed3e8659c0011258ab7ecfc96533e13c022c00b)
bug #2255: Add RAW section to template creation form(cherry picked from commit fc32d730158c64bc7e7e429703cd472385d33379)
bug #2255: Add RAW tab to views conf(cherry picked from commit b3c0f6a8525eba1e322025e657bd3a1657ef0802)
bug #2255: Update css(cherry picked from commit 61558708ed12ea2000c5a265a3752284794862cf)
bug #2255: Hide data_vmx by default(cherry picked from commit b6c75a34d12a3acf364c812b0026be220b0d49a2)
bug #2255: Add custom tags to template creation form(cherry picked from commit 97b713fd7f0f386898f4f3c07010a8d44db531fe)