2.1.6-SNAPSHOT (for 2.1.5 release) + spc.tmpl updates for RPM Releases.

2.1.6-SNAPSHOT release patch.  This marks a change in the version naming, where we will update point releases into the maven pom, fork off of those releases to modify the pom.  TODO make 2.1.5-release tag ...........