CROSS-1294: Fix next version after release (part 2)
Merge branch 'stable/1.15.x' of github.com:exoplatform/jcr into fix/1.15.4-GA/JCR-2125
JCR-2125: cleanup the code