Fix for rpm-based packages when self-signed cert is used to sign java applet

RPM build failed when the self-signed cert was used because the macro did not
expand correctly.

(cherry picked from commit 7dfa06ecc9066989d9f257fdca8e59188e1c72d4)
Fixes for el6 spec file

Some minor adjustments to sync up the el6 spec file with fedora.

(cherry picked from commit 0600473f346920334ed147f3c39a28aff7e4aaea)