Merge "Update lf-maven-stage macro with missing parts"